From 1559538910d66835f80c7e5f8854bff65fdebd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Tue, 7 Jun 2016 09:12:25 +0200
Subject: Rebuild against libsolv enabled Debian and Arch package format
---
...-Align-Debian-and-Arch-support-to-libsolv.patch | 35 +++++++++++++++++-----
perl-BSSolv.spec | 6 +++-
2 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/BSSolv-0.01-Align-Debian-and-Arch-support-to-libsolv.patch
b/BSSolv-0.01-Align-Debian-and-Arch-support-to-libsolv.patch
index ca1d0ba..d0834b7 100644
--- a/BSSolv-0.01-Align-Debian-and-Arch-support-to-libsolv.patch
+++ b/BSSolv-0.01-Align-Debian-and-Arch-support-to-libsolv.patch
@@ -1,4 +1,4 @@
-From d029425eaf9346fab7cdee77e546032e46ee8581 Mon Sep 17 00:00:00 2001
+From a6e945332b7252cd7b334f0be6a5940c562b53a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com>
Date: Mon, 6 Jun 2016 13:43:49 +0200
Subject: [PATCH] Align Debian and Arch support to libsolv
@@ -13,9 +13,9 @@ support them.
https://bugzilla.redhat.com/show_bug.cgi?id=1342160
Signed-off-by: Petr Písař <ppisar(a)redhat.com>
---
- BSSolv.xs | 8 +++++++-
- Makefile.PL | 8 ++++++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
+ BSSolv.xs | 8 +++++++-
+ Makefile.PL | 16 +++++++++++++---
+ 2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/BSSolv.xs b/BSSolv.xs
index 4468be9..9116a7c 100644
@@ -50,24 +50,43 @@ index 4468be9..9116a7c 100644
if (!p)
return 0;
diff --git a/Makefile.PL b/Makefile.PL
-index 1325734..1825dc7 100644
+index 1325734..e150b52 100644
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -13,6 +13,14 @@ if (@ARGV && $ARGV[0] eq '--bundled-libsolv') {
+@@ -2,20 +2,30 @@ use ExtUtils::MakeMaker;
+
+ my $solvprefix = '/usr';
+
+-my $inc = "-I$solvprefix/include/solv";
++my @inc_dirs = ("$solvprefix/include/solv");
+ my $lib = '';
+
+ if (@ARGV && $ARGV[0] eq '--bundled-libsolv') {
+ my $builddir = 'libsolv';
+- $inc = "-I$builddir/src -I$builddir/ext";
++ @inc_dirs = ("$builddir/src", "$builddir/ext");
+ $lib = "-L$builddir/src -L$builddir/ext";
+ }
$lib = ($lib ? "$lib " : '') . '-lsolvext -lsolv -lz -llzma';
+my $def = '';
-+if (-e "$inc/repo_deb.h") {
++
++if (grep {-e "$_/repo_deb.h"} @inc_dirs) {
+ $def .= ' -DHAVE_DEBIAN';
+}
-+if (-e "$inc/repo_arch.h") {
++if (grep {-e "$_/repo_arch.h"} @inc_dirs) {
+ $def .= ' -DHAVE_ARCH';
+}
+
WriteMakefile(
NAME => 'BSSolv',
VERSION_FROM => 'BSSolv.pm',
+- INC => $inc,
++ DEFINE => $def,
++ INC => join(' ', map("-I$_", @inc_dirs)),
+ LIBS => [ $lib ],
+ )
--
2.5.5
diff --git a/perl-BSSolv.spec b/perl-BSSolv.spec
index 1fe9a85..f73562f 100644
--- a/perl-BSSolv.spec
+++ b/perl-BSSolv.spec
@@ -2,7 +2,7 @@
Name: perl-BSSolv
Version: 0.01
-Release: 12.git%{gitrev}%{?dist}
+Release: 13.git%{gitrev}%{?dist}
Url:
https://github.com/openSUSE/perl-BSSolv
# Taken from the upstream url from the revision %{gitrev}
Source0: BSSolv-%{version}-git%{gitrev}.tar.gz
@@ -47,6 +47,10 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm
-f {} ';'
%doc README
%changelog
+* Tue Jun 07 2016 Petr Pisar <ppisar(a)redhat.com> - 0.01-13.git1e18c32
+- Fix Debian and Arch support alignent to libsolv (bug #1342160)
+- Rebuild against libsolv enabled Debian and Arch package format (bug #1342160)
+
* Mon Jun 06 2016 Petr Pisar <ppisar(a)redhat.com> - 0.01-12.git1e18c32
- Align Debian and Arch support to libsolv (bug #1342160)
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-BSSolv.git/commit/?h=master&i...