- use the same version of bdb utils that rpm does

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

diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch
index 75004b53bad158385a3fcfd71f4fac6428bc8f55..81f9e0fd5280ac257fb38b65117c7fed634af640 100644 (file)
--- a/util-vserver-pld.patch
+++ b/util-vserver-pld.patch
@@ -28,8 +28,8 @@
                           gentoo/init-vserver.sh gentoo/net.vserver \
 -                         gentoo/reboot.sh gentoo/shutdown.sh
 +                         gentoo/reboot.sh gentoo/shutdown.sh\
-+                         pld-ac/pkgs/01 pld-ac/rpm/macros \
-+                         pld-th/pkgs/01 pld-th/rpm/macros
++                         pld-ac/pkgs/01 pld-ac/rpm/macros pld-ac/rpm/macros.lang \
++                         pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpm/macros.lang
  
  nobase_confdistrib_DATA       =  rh9/apt/sources.list \
                           fc1/apt/sources.list \
@@ -122,19 +122,22 @@
 +sources = ac-main ac-updates
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros 1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros      2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,6 @@
-+# 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
+@@ -0,0 +1,3 @@
 +%_netsharedpath               /dev:/proc
 +%_tmppath                     /tmp
 +%_host_os                     %_os
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros.lang    1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros.lang 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-th/pkgs/01    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-th/pkgs/01 2009-06-22 17:48:26.000000000 +0200
 @@ -0,0 +1,6 @@
 +basesystem
 +filesystem
-+glibc-misc
++glibc
 +issue
 +rpm-base
 +vserver-packages
@@ -214,13 +217,16 @@
 +autoup = no
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros 1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros      2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,6 @@
-+# 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
+@@ -0,0 +1,3 @@
 +%_netsharedpath               /dev:/proc
 +%_tmppath                     /tmp
 +%_host_os                     %_os
+--- util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros.lang    1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros.lang 2009-06-22 17:48:26.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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
 --- util-vserver-0.30.216-r2837.orig/scripts/functions 2009-06-22 17:36:35.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/functions      2009-06-22 17:48:26.000000000 +0200
 @@ -403,6 +403,20 @@
@@ -722,7 +728,7 @@
        else
 --- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.poldek    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions.poldek 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,81 @@
+@@ -0,0 +1,83 @@
 +# $Id$        --*- sh -*--
 +
 +# Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
@@ -801,8 +807,10 @@
 +              sed -i -e "s#^\(_prefix\s*\)=.*#\1= $MIRROR#" "$PKGCFGDIR"/poldek/etc/repos.d/*.conf
 +      fi
 +
-+#    test -z "$POLDEKCONFDEFAULT" || \
-+#     $_LN_S "$POLDEKCONFDEFAULT" "$PKGCFGDIR"/poldek/etc/
++      if [ "$DISTRIBUTION" = "pld-ac" ]; then
++              echo 'auto directory dependencies = no' >>  "$PKGCFGDIR"/poldek/etc/poldek.conf
++              echo '%_check_dirname_deps 0' >> "$PKGCFGDIR"/rpm/etc/macros
++      fi
 +}
 --- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.poldek      1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/scripts/vserver-build.poldek   2009-06-22 17:48:26.000000000 +0200