[packages/util-vserver] - rel 2; more datadir fixes

arekm arekm at pld-linux.org
Tue Nov 26 11:57:09 CET 2013 

commit 99e1c7ab099a84ad53d414a0b1efe21c1052a545
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Nov 26 11:57:05 2013 +0100

    - rel 2; more datadir fixes

 rebootmgr.init                  |  2 +-
 util-vserver-pld.patch          |  4 ++--
 util-vserver-rpm5.patch         |  2 +-
 util-vserver-vsysvwrapper.patch |  2 +-
 util-vserver.init               |  2 +-
 util-vserver.spec               | 22 ++++++++--------------
 vprocunhide.init                |  2 +-
 vservers-legacy.init            |  2 +-
 vservers.init                   |  2 +-
 vservers.sysconfig              |  2 +-
 10 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/util-vserver.spec b/util-vserver.spec
index b43db3b..1129bbb 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -19,7 +19,7 @@
 %define		reqdb_ver	5.2
 %define		reqdb_pkg	db%{reqdb_ver}
 %define		snap	pre3054
-%define		rel	1
+%define		rel	2
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -517,15 +517,11 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/cgroup/per-ss
 
 chmod -R +rX $RPM_BUILD_ROOT%{_datadir}/%{name}/distributions/*
 
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/vservers
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE15} > \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \
-	$RPM_BUILD_ROOT/etc/sysconfig/vservers
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' gentoo/bash-wrapper > \
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers
+cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver
+cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/vservers
+sed 's|%{_usrlib}/util-vserver|%{_datadir}/%{name}|g' gentoo/bash-wrapper > \
 	$RPM_BUILD_ROOT%{_libdir}/%{name}/bash-wrapper
 
 %if %{with legacy}
@@ -540,10 +536,8 @@ for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
 EOF
 done
 
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
-sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 %else
 rm $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
diff --git a/rebootmgr.init b/rebootmgr.init
index 5a7ae5e..5936e0c 100644
--- a/rebootmgr.init
+++ b/rebootmgr.init
@@ -10,7 +10,7 @@
 
 . /etc/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 	echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 	exit 1
diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index 8977801..44c3c04 100644
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -586,7 +586,7 @@
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +
-+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1
@@ -665,7 +665,7 @@
 +
 +set -e
 +
-+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1
diff --git a/util-vserver-rpm5.patch b/util-vserver-rpm5.patch
index 7f0cf06..5ac07a2 100644
--- a/util-vserver-rpm5.patch
+++ b/util-vserver-rpm5.patch
@@ -33,7 +33,7 @@
 +
 +set -e
 +
-+: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
++: ${UTIL_VSERVER_VARS:=/usr/share/util-vserver/util-vserver-vars}
 +test -e "$UTIL_VSERVER_VARS" || {
 +    echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +    exit 1
diff --git a/util-vserver-vsysvwrapper.patch b/util-vserver-vsysvwrapper.patch
index b75af20..d81a279 100644
--- a/util-vserver-vsysvwrapper.patch
+++ b/util-vserver-vsysvwrapper.patch
@@ -10,7 +10,7 @@
 -    exit 1
 -}
 +
-+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
++[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 +if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 +	echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 +	exit 1
diff --git a/util-vserver.init b/util-vserver.init
index e0a6060..3f7e025 100644
--- a/util-vserver.init
+++ b/util-vserver.init
@@ -17,7 +17,7 @@ fi
 # Source function library
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 	echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 	exit 1
diff --git a/vprocunhide.init b/vprocunhide.init
index 4bc80ce..423a15d 100644
--- a/vprocunhide.init
+++ b/vprocunhide.init
@@ -19,7 +19,7 @@ fi
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 	echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 	exit 1
diff --git a/vservers-legacy.init b/vservers-legacy.init
index 6724107..c6e96b9 100644
--- a/vservers-legacy.init
+++ b/vservers-legacy.init
@@ -9,7 +9,7 @@
 
 . /etc/sysconfig/vservers-legacy
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 	echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 	exit 1
diff --git a/vservers.init b/vservers.init
index 7826c86..6908c58 100644
--- a/vservers.init
+++ b/vservers.init
@@ -14,7 +14,7 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
 	echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
 	exit 1
diff --git a/vservers.sysconfig b/vservers.sysconfig
index 0720dc2..64be5f0 100644
--- a/vservers.sysconfig
+++ b/vservers.sysconfig
@@ -33,4 +33,4 @@ MARKS="default"
 # The location of util-vserver-vars
 # This file contains variables to util-vserver scripts used within the
 # init script. Change at your own risk.
-#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+#UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-vserver.git/commitdiff/99e1c7ab099a84ad53d414a0b1efe21c1052a545

More information about the pld-cvs-commit mailing list