split perl patch libguestfs-1.19.30.patch into

libguestfs.perl.install_vendor.patch and libguestfs.perl.no-rpath.patch
Both are needed in upcoming versions

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=21
This commit is contained in:
Olaf Hering 2012-08-29 14:07:05 +00:00 committed by Git OBS Bridge
parent aea87fef39
commit d9ff6c49c2
4 changed files with 28 additions and 18 deletions

View File

@ -1,10 +1,9 @@
---
examples/Makefile.am | 2 +-
fuse/Makefile.am | 2 +-
fuse/Makefile.in | 2 +-
src/Makefile.am | 2 +-
tests/mount-local/Makefile.am | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
4 files changed, 4 insertions(+), 4 deletions(-)
Index: libguestfs-1.19.34/examples/Makefile.am
===================================================================

View File

@ -0,0 +1,18 @@
Make sure perl gets installed into vendor path.
---
perl/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/perl/Makefile.am
===================================================================
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -74,7 +74,7 @@ clean-local:
rm -f Makefile-pl
install-data-hook:
- $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install
+ $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install_vendor
endif

View File

@ -1,13 +1,13 @@
[ 193s] ERROR: RPATH "/home/abuild/rpmbuild/BUILD/libguestfs-1.19.30/src/.libs" on /home/abuild/rpmbuild/BUILDROOT/libguestfs-1.19.30-1.x86_64/usr/lib/perl5/site_perl/5.16.0/x86_64-linux-thread-multi/auto/Sys/Guestfs/Guestfs.so is not allowed
[ 193s] ERROR: RPATH "/home/abuild/rpmbuild/BUILD/libguestfs-1.19.30/src/.libs" on /home/abuild/rpmbuild/BUILDROOT/libguestfs-1.19.30-1.x86_64/usr/lib/perl5/site_perl/5.16.0/x86_64-linux-thread-multi/auto/Sys/Guestfs/Guestfs.so is not allowed
---
perl/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
perl/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
Index: libguestfs-1.19.30/perl/Makefile.am
Index: b/perl/Makefile.am
===================================================================
--- libguestfs-1.19.30.orig/perl/Makefile.am
+++ libguestfs-1.19.30/perl/Makefile.am
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -65,6 +65,8 @@ all: Makefile-pl src_deps
Makefile-pl: Makefile.PL
@ -17,12 +17,3 @@ Index: libguestfs-1.19.30/perl/Makefile.am
# No! Otherwise it is deleted before the clean-local rule runs.
#CLEANFILES = Makefile-pl
@@ -74,7 +76,7 @@ clean-local:
rm -f Makefile-pl
install-data-hook:
- $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install
+ $(MAKE) -f Makefile-pl DESTDIR=$(DESTDIR) install_vendor
endif

View File

@ -118,9 +118,10 @@ License: LGPL-2.1
Group: System/Filesystems
Version: 1.19.34
Release: 0
Patch: libguestfs-1.19.30.patch
Patch34: libguestfs-1.19.34.patch
Patch5: libguestfs-1.13.14-ruby.patch
Patch100: libguestfs.perl.install_vendor.patch
Patch101: libguestfs.perl.no-rpath.patch
Source0: %{name}-%{version}.tar.gz
Source1: guestfs.tar.xz
Recommends: %{name}-data
@ -267,8 +268,9 @@ virtual machines.
%prep
%setup -q
%patch -p1
%patch34 -p1
%patch100 -p1
%patch101 -p1
%build
# disable qemu test.