- set dist dir to pld-ac

[packages/util-vserver.git] / util-vserver-pld.patch

diff -urN util-vserver-0.30.207/distrib/Makefile.am util-vserver-0.30.207-pld/distrib/Makefile.am
--- util-vserver-0.30.207/distrib/Makefile.am	2005-04-08 21:12:09.000000000 +0200
+++ util-vserver-0.30.207-pld/distrib/Makefile.am	2005-05-17 15:27:16.884625000 +0200
@@ -43,7 +43,8 @@
 			   fc3/yum/yum.conf $(wildcard fc3/yum.repos.d/fedora*.repo) \
 			   $(wildcard fc3/rpmlist.d/*.lst) $(wildcard fc3/rpmlist.d/*.opt) \
 			   suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
-			   suse91/rpm/macros
+			   suse91/rpm/macros \
+			   pld-ac/pkgs/01 pld-ac/rpm/macros pld-ac/rpmlist.d/00.lst
 
 nobase_confdistrib_DATA	=  rh9/apt/sources.list \
 			   fc1/apt/sources.list \
@@ -67,6 +68,7 @@
 				ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \
 				ln -sf ../redhat/initpre  $(DESTDIR)$(distribdir)/$$i/; \
 			done
+			ln -sf pld-ac $(DESTDIR)$(distribdir)/pld1.99
 			$(mkinstalldirs) $(DESTDIR)$(confdir) \
 				$(DESTDIR)$(confdistribdir)/.common/pubkeys \
 				$(DESTDIR)$(confdefaultsdir) \
diff -urN util-vserver-0.30.207/distrib/pld-ac/pkgs/01 util-vserver-0.30.207-pld/distrib/pld-ac/pkgs/01
--- util-vserver-0.30.207/distrib/pld-ac/pkgs/01	1970-01-01 01:00:00.000000000 +0100
+++ util-vserver-0.30.207-pld/distrib/pld-ac/pkgs/01	2005-05-16 19:09:20.000000000 +0200
@@ -0,0 +1,3 @@
+basesystem
+glibc
+issue
diff -urN util-vserver-0.30.207/distrib/pld-ac/rpm/macros util-vserver-0.30.207-pld/distrib/pld-ac/rpm/macros
--- util-vserver-0.30.207/distrib/pld-ac/rpm/macros	1970-01-01 01:00:00.000000000 +0100
+++ util-vserver-0.30.207-pld/distrib/pld-ac/rpm/macros	2005-05-17 15:23:04.279026888 +0200
@@ -0,0 +1,4 @@
+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725
+# you have to use at least one language beside 'C'
+%_install_langs		C:en:pl
+%_netsharedpath		/dev
diff -urN util-vserver-0.30.207/distrib/pld-ac/rpmlist.d/00.lst util-vserver-0.30.207-pld/distrib/pld-ac/rpmlist.d/00.lst
--- util-vserver-0.30.207/distrib/pld-ac/rpmlist.d/00.lst	1970-01-01 01:00:00.000000000 +0100
+++ util-vserver-0.30.207-pld/distrib/pld-ac/rpmlist.d/00.lst	2005-05-17 15:15:56.643037440 +0200
@@ -0,0 +1,8 @@
+basesystem-*.rpm
+dev-*.rpm
+FHS-*.rpm
+glibc-misc-*.rpm
+glibc-[0-9]*.rpm
+libgcc-[0-9]*.rpm
+setup-*.rpm
+issue-[0-9]*.rpm
diff -ur -x '*~' -x .libs -x .deps util-vserver-0.30.207/scripts/functions util-vserver-0.30.207-poldek/scripts/functions
--- util-vserver-0.30.207/scripts/functions	2005-05-20 18:33:27.361745984 +0200
+++ util-vserver-0.30.207-poldek/scripts/functions	2005-05-20 18:33:06.191964280 +0200
@@ -674,6 +674,8 @@
 	style=redhat
     elif test -e "$_pgs_vdir"/etc/mandrake-release; then
 	style=mandrake
+    elif test -e "$_pgs_vdir"/etc/pld-release; then
+	style=pld
     elif test -e "$_pgs_vdir"/etc/debian_version; then
 	style=debian
     elif test -e "$_pgs_vdir"/etc/SuSE-release; then
diff -urN util-vserver-0.30.207/scripts/vserver-build.functions util-vserver-0.30.207-pld/scripts/vserver-build.functions
--- util-vserver-0.30.207/scripts/vserver-build.functions	2005-04-16 23:20:45.000000000 +0200
+++ util-vserver-0.30.207-pld/scripts/vserver-build.functions	2005-05-17 15:13:49.646343872 +0200
@@ -133,6 +133,9 @@
 	elif test -e /etc/slackware-release; then
 	    set -- $(cat /etc/slackware-release)
 	    DISTRIBUTION=slackware$2
+	elif test -e /etc/pld-release; then
+	    set -- $(cat /etc/pld-release)
+	    DISTRIBUTION=pld$1
 	elif test -n "$1"; then
 	    DISTRIBUTION=$1
 	else
diff -ur -x '*~' -x .libs -x .deps util-vserver-0.30.207/scripts/vpkg util-vserver-0.30.207-poldek/scripts/vpkg
--- util-vserver-0.30.207/scripts/vpkg	2005-03-21 21:03:30.000000000 +0100
+++ util-vserver-0.30.207-poldek/scripts/vpkg	2005-05-20 18:22:18.745391120 +0200
@@ -115,6 +115,44 @@
 	    fi
 	fi
 	;;
+    (pld)
+	rpm_param=
+	poldek_param=
+	case "$tag" in
+	    ## rpm outputs sometimes '(contains no files)', so return
+	    ## only the valid output
+	    (get-conffiles)
+		rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );;
+	    (install)
+		rpm_param=( -Uvh "$@" )
+		poldek_param=( --install -v "$@" )
+		;;
+	esac
+	
+	if test -n "$is_external"; then
+	    have_poldek=1
+	    test -d "$cfgdir"/base/poldek -o -d "$cfgdir"/poldeketc || have_poldek=
+	else
+	    have_poldek=
+	    for i in /bin /usr/bin /usr/local/bin; do
+		test ! -x "$vdir$i"/poldek || { have_poldek=1; break; }
+	    done
+	fi
+	
+	if test -n "$is_external"; then
+	    if test "$have_poldek" -a "$poldek_param"; then
+		cmd=( "$_VPOLDEK" "$vserver" -- "${poldek_param[@]}" )
+	    else
+		cmd=( "$_VRPM" "$vserver" -- "${rpm_param[@]}" )
+	    fi
+	else
+	    if test "$have_poldek" -a "$poldek_param"; then
+		cmd=( "$_VSERVER" --silent "$vserver" exec poldek "${poldek_param[@]}" )
+	    else
+		cmd=( "$_VSERVER" --silent "$vserver" exec rpm "${rpm_param[@]}" )
+	    fi
+	fi
+	;;
     (debian)
 	case "$tag" in
 	    (get-conffiles)