[whatsup] Install into vendorarch instead of sitearch
Ruben Kerkhof
ruben at fedoraproject.org
Thu Mar 10 17:36:57 UTC 2011
commit 2e33766b96b0d46e9c9711242f46b6de0e333f78
Author: Ruben <ruben at rubenkerkhof.com>
Date: Thu Mar 10 18:36:47 2011 +0100
Install into vendorarch instead of sitearch
whatsup-install-into-vendorarch.patch | 36 +++++++++++++++++++++++++++++++++
whatsup.spec | 6 ++++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/whatsup-install-into-vendorarch.patch b/whatsup-install-into-vendorarch.patch
new file mode 100644
index 0000000..07bb081
--- /dev/null
+++ b/whatsup-install-into-vendorarch.patch
@@ -0,0 +1,36 @@
+diff -up whatsup-1.12/src/Libnodeupdown/Makefile.in.orig whatsup-1.12/src/Libnodeupdown/Makefile.in
+--- whatsup-1.12/src/Libnodeupdown/Makefile.in.orig 2011-03-10 18:10:12.915000392 +0100
++++ whatsup-1.12/src/Libnodeupdown/Makefile.in 2011-03-10 18:10:27.407993940 +0100
+@@ -217,7 +217,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ PERL_INC = "-I../../config -I$(srcdir)/../libcommon -I$(srcdir)/../libexpat -I$(srcdir)/../libnodeupdown"
+ PERL_LIBS = "-L../libnodeupdown/.libs -lnodeupdown"
+-MAKEMAKERFLAGS = INSTALLDIRS=site \
++MAKEMAKERFLAGS = INSTALLDIRS=vendor \
+ DESTDIR=$(PERL_DESTDIR) \
+ PREFIX=$(prefix) \
+ INC=$(PERL_INC) \
+diff -up whatsup-1.12/src/Nodeupdown/Makefile.in.orig whatsup-1.12/src/Nodeupdown/Makefile.in
+--- whatsup-1.12/src/Nodeupdown/Makefile.in.orig 2011-03-10 18:16:54.358999944 +0100
++++ whatsup-1.12/src/Nodeupdown/Makefile.in 2011-03-10 18:17:37.551998743 +0100
+@@ -222,9 +222,9 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-INSTALLSITEARCH = `$(PERL) -e 'use Config; $$T=$$Config{installsitearch}; $$T=~/^\Q$$Config{siteprefix}\E\/(.+)/; print $$1;'`
++INSTALLVENDORARCH = `$(PERL) -e 'use Config; $$T=$$Config{installvendorarch}; $$T=~/^\Q$$Config{vendorprefix}\E\/(.+)/; print $$1;'`
+ @WITH_PERL_EXTENSIONS_TRUE at NODEUPDOWNPMFILES = Nodeupdown.pm
+- at WITH_PERL_EXTENSIONS_TRUE@NODEUPDOWNPMFILESdir = $(prefix)/$(INSTALLSITEARCH)
++ at WITH_PERL_EXTENSIONS_TRUE@NODEUPDOWNPMFILESdir = $(prefix)/$(INSTALLVENDORARCH)
+ @WITH_PERL_EXTENSIONS_TRUE at NODEUPDOWNPMFILES_DATA = $(NODEUPDOWNPMFILES)
+ @WITH_PERL_EXTENSIONS_TRUE at man3_MANS = Nodeupdown.$(PERLMAN3EXT)
+ EXTRA_DIST = Nodeupdown.pm
+@@ -472,7 +472,7 @@ uninstall-man: uninstall-man3
+ @WITH_PERL_EXTENSIONS_TRUE@ $(POD2MAN) Nodeupdown.pm Nodeupdown.$(PERLMAN3EXT)
+
+ @WITH_PERL_EXTENSIONS_TRUE at install-data-hook:
+- at WITH_PERL_EXTENSIONS_TRUE@ chmod 444 $(DESTDIR)/$(prefix)/$(INSTALLSITEARCH)/Nodeupdown.pm
++ at WITH_PERL_EXTENSIONS_TRUE@ chmod 444 $(DESTDIR)/$(prefix)/$(INSTALLVENDORARCH)/Nodeupdown.pm
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/whatsup.spec b/whatsup.spec
index c421c29..3a3e426 100644
--- a/whatsup.spec
+++ b/whatsup.spec
@@ -9,7 +9,7 @@
Summary: Node up/down detection utility
Name: whatsup
Version: 1.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Communications
License: GPLv2+
URL: https://computing.llnl.gov/linux/whatsup.html
@@ -147,6 +147,7 @@ fi
%{_mandir}/man3/Libnodeupdown.3*
%{_mandir}/man3/Nodeupdown.3*
%{perl_vendorarch}/*
+%exclude %dir %{perl_vendorarch}/auto/
%files -n %{name}-pingd
%defattr(-,root,root,-)
@@ -203,6 +204,9 @@ fi
%changelog
+* Thu Mar 10 2011 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.12-2
+- Install into vendorarch instead of sitearch
+
* Mon Mar 07 2011 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.12-1
- Upstream released new version
- Link against system-provided expat (#652981)
More information about the scm-commits
mailing list