From c1d86675b0cbd96ba4b15d16f8126a86105dfb3b Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jples...@redhat.com>
Date: Tue, 23 Feb 2016 10:15:29 +0100
Subject: 1.2 bump
---
.gitignore | 1 +
RPM2-1.2-Fix-global-symbol-error.patch | 12 ++++++++++
perl-RPM2-1.0-testplan.patch | 13 ----------
perl-RPM2-switchofffunctions.patch | 44 ----------------------------------
perl-RPM2.spec | 36 ++++++++++++++++++----------
sources | 2 +-
6 files changed, 38 insertions(+), 70 deletions(-)
create mode 100644 RPM2-1.2-Fix-global-symbol-error.patch
delete mode 100644 perl-RPM2-1.0-testplan.patch
delete mode 100644 perl-RPM2-switchofffunctions.patch
diff --git a/.gitignore b/.gitignore
index fb577ef..4259378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
RPM2-0.68.tar.gz
/RPM2-0.69.tar.gz
/RPM2-1.0.tar.gz
+/RPM2-1.2.tar.gz
diff --git a/RPM2-1.2-Fix-global-symbol-error.patch
b/RPM2-1.2-Fix-global-symbol-error.patch
new file mode 100644
index 0000000..2f99836
--- /dev/null
+++ b/RPM2-1.2-Fix-global-symbol-error.patch
@@ -0,0 +1,12 @@
+diff -up RPM2-1.2/lib/RPM2.pm.orig RPM2-1.2/lib/RPM2.pm
+--- RPM2-1.2/lib/RPM2.pm.orig 2016-02-23 09:57:12.655880957 +0100
++++ RPM2-1.2/lib/RPM2.pm 2016-02-23 09:57:26.192842756 +0100
+@@ -8,7 +8,7 @@ use File::Basename qw/basename dirname/;
+ use File::Spec ();
+
+ use vars qw/$VERSION/;
+-$VERSION = '1.2';
++our $VERSION = '1.2';
+ use vars qw/@ISA/;
+ @ISA = qw/DynaLoader/;
+
diff --git a/perl-RPM2-1.0-testplan.patch b/perl-RPM2-1.0-testplan.patch
deleted file mode 100644
index b3b80ba..0000000
--- a/perl-RPM2-1.0-testplan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test.pl b/test.pl
-index 116c48a..40426ed 100644
---- a/test.pl
-+++ b/test.pl
-@@ -11,7 +11,7 @@ use strict;
-
- use Test;
- use strict;
--BEGIN { plan tests => 62 };
-+BEGIN { plan tests => 60 };
- use RPM2;
- use POSIX;
- ok(1); # If we made it this far, we're ok.
diff --git a/perl-RPM2-switchofffunctions.patch
b/perl-RPM2-switchofffunctions.patch
deleted file mode 100644
index 6394938..0000000
--- a/perl-RPM2-switchofffunctions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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 06cbdb2..3597001 100644
--- a/perl-RPM2.spec
+++ b/perl-RPM2.spec
@@ -1,22 +1,33 @@
Name: perl-RPM2
-Version: 1.0
-Release: 16%{?dist}
+Version: 1.2
+Release: 1%{?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
+Patch0: RPM2-1.2-Fix-global-symbol-error.patch
BuildRequires: coreutils
BuildRequires: findutils
+BuildRequires: gcc
BuildRequires: perl
-BuildRequires: perl(Module::Build) >= 0.35
+BuildRequires: perl-devel
+BuildRequires: perl(Module::Build)
+BuildRequires: perl(strict)
+BuildRequires: perl(warnings)
+BuildRequires: pkgconfig
BuildRequires: rpm-devel
+# Run-time
+BuildRequires: perl(Cwd)
+BuildRequires: perl(DynaLoader)
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(overload)
+BuildRequires: perl(vars)
# Tests
-BuildRequires: perl(Test)
BuildRequires: perl(POSIX)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
+BuildRequires: perl(Test)
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%{?perl_default_filter}
@@ -27,17 +38,15 @@ bindings for the RPM Package Manager API.
%prep
%setup -q -n RPM2-%{version}
-%patch0 -p1 -b .testplan
-%patch1 -p1 -b .switchoff
+%patch0 -p1
%build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
./Build
%install
./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
+find %{buildroot} -type f -name '*.bs' -size 0 -delete
%{_fixperms} $RPM_BUILD_ROOT/*
%check
@@ -50,6 +59,9 @@ find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {}
\;
%{_mandir}/man3/*
%changelog
+* Tue Feb 23 2016 Jitka Plesnikova <jples...@redhat.com> - 1.2-1
+- 1.2 bump
+
* Thu Feb 04 2016 Fedora Release Engineering <rel...@fedoraproject.org> -
1.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 5ffb7ee..b9178a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c68361fe4511707526c66553a4eadb7f RPM2-1.0.tar.gz
+f8538a4fe9bfe1b712995b6a84d64ecc RPM2-1.2.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-RPM2.git/commit/?h=master&id=c1d86675b0cbd96ba4b15d16f8126a86105dfb3b
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
