remove libguestfs.perl.install_vendor.patch
INSTALLDIRS=vendor can be used to select a different dir from Fedora libguestfs.spec OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=42
This commit is contained in:
parent
12d47b73e2
commit
c99bbec8f1
@ -1,18 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
@ -143,7 +143,6 @@ Release: 0
|
|||||||
Patch1: 0001-daemon-Remove-e2prog-hack-only-needed-for-RHEL-5.patch
|
Patch1: 0001-daemon-Remove-e2prog-hack-only-needed-for-RHEL-5.patch
|
||||||
Patch2: 0002-daemon-collect-list-of-called-external-commands.patch
|
Patch2: 0002-daemon-collect-list-of-called-external-commands.patch
|
||||||
Patch5: libguestfs-1.13.14-ruby.patch
|
Patch5: libguestfs-1.13.14-ruby.patch
|
||||||
Patch100: libguestfs.perl.install_vendor.patch
|
|
||||||
Patch101: libguestfs.perl.no-rpath.patch
|
Patch101: libguestfs.perl.no-rpath.patch
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Source10: libguestfs.mkinitrd.boot.sh
|
Source10: libguestfs.mkinitrd.boot.sh
|
||||||
@ -294,7 +293,6 @@ virtual machines.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch100 -p1
|
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -325,7 +323,10 @@ autoreconf -fi
|
|||||||
%{_configure_ruby} \
|
%{_configure_ruby} \
|
||||||
--disable-rpath \
|
--disable-rpath \
|
||||||
--disable-static
|
--disable-static
|
||||||
make %{?jobs:-j%jobs}
|
# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir instead of the site dir
|
||||||
|
make \
|
||||||
|
INSTALLDIRS=vendor \
|
||||||
|
%{?jobs:-j%jobs}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%makeinstall
|
%makeinstall
|
||||||
|
Loading…
Reference in New Issue
Block a user