commit e8cce2b129310ea5935a761801f4769f116a8f26 Author: Marcela Mašláňová <mmaslano@xxxxxxxxxx> Date: Thu Apr 26 11:41:27 2012 +0200 - switch off some functions for now, which were defined as "private" in new rpm - rebuild with new rpm-4.10 perl-RPM2-switchofffunctions.patch | 44 ++++++++++++++++++++++++++++++++++++ perl-RPM2.spec | 8 +++++- 2 files changed, 51 insertions(+), 1 deletions(-) --- diff --git a/perl-RPM2-switchofffunctions.patch b/perl-RPM2-switchofffunctions.patch new file mode 100644 index 0000000..6394938 --- /dev/null +++ b/perl-RPM2-switchofffunctions.patch @@ -0,0 +1,44 @@ +diff -up RPM2-1.0/lib/RPM2.xs.old RPM2-1.0/lib/RPM2.xs +--- RPM2-1.0/lib/RPM2.xs.old 2011-04-01 16:16:49.000000000 +0200 ++++ RPM2-1.0/lib/RPM2.xs 2012-04-26 11:29:25.849234177 +0200 +@@ -71,9 +71,6 @@ void * _null_callback( + break; + + case RPMCALLBACK_INST_START: +- rpmcliHashesCurrent = 0; +- if (h == NULL || !(flags & INSTALL_LABEL)) +- break; + break; + + case RPMCALLBACK_TRANS_PROGRESS: +@@ -81,30 +78,18 @@ void * _null_callback( + break; + + case RPMCALLBACK_TRANS_START: +- rpmcliHashesCurrent = 0; +- rpmcliProgressTotal = 1; +- rpmcliProgressCurrent = 0; + break; + + case RPMCALLBACK_TRANS_STOP: +- rpmcliProgressTotal = rpmcliPackagesTotal; +- rpmcliProgressCurrent = 0; + break; + + case RPMCALLBACK_REPACKAGE_START: +- rpmcliHashesCurrent = 0; +- rpmcliProgressTotal = total; +- rpmcliProgressCurrent = 0; + break; + + case RPMCALLBACK_REPACKAGE_PROGRESS: + break; + + case RPMCALLBACK_REPACKAGE_STOP: +- rpmcliProgressTotal = total; +- rpmcliProgressCurrent = total; +- rpmcliProgressTotal = rpmcliPackagesTotal; +- rpmcliProgressCurrent = 0; + break; + + case RPMCALLBACK_UNINST_PROGRESS: diff --git a/perl-RPM2.spec b/perl-RPM2.spec index b76577f..f9d2ff5 100644 --- a/perl-RPM2.spec +++ b/perl-RPM2.spec @@ -1,12 +1,13 @@ Name: perl-RPM2 Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl bindings for the RPM Package Manager API License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/RPM2/ Source0: http://www.cpan.org/authors/id/L/LK/LKUNDRAK/RPM2-%{version}.tar.gz Patch0: %{name}-1.0-testplan.patch +Patch1: %{name}-switchofffunctions.patch BuildRequires: rpm-devel BuildRequires: perl(Module::Build) >= 0.3500 # Tests @@ -24,6 +25,7 @@ bindings for the RPM Package Manager API. %prep %setup -q -n RPM2-%{version} %patch0 -p1 -b .testplan +%patch1 -p1 -b .switchoff %build %{__perl} Build.PL installdirs=vendor @@ -45,6 +47,10 @@ find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; %{_mandir}/man3/* %changelog +* Thu Apr 26 2012 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 1.0-3 +- switch off some functions for now, which were defined as "private" in new rpm +- rebuild with new rpm-4.10 + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel