]> git.pld-linux.org Git - packages/util-vserver.git/blobdiff - util-vserver-pld.patch
- use the same version of bdb utils that rpm does
[packages/util-vserver.git] / util-vserver-pld.patch
index 19573357e7d513551e3f5ad3e3c147c5cb647d68..81f9e0fd5280ac257fb38b65117c7fed634af640 100644 (file)
@@ -1,4 +1,3 @@
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf util-vserver-0.30.216-r2837/distrib/defaults/poldek/poldek.conf
 --- util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf       1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/defaults/poldek/poldek.conf    2009-06-22 17:48:26.000000000 +0200
 @@ -0,0 +1,11 @@
@@ -13,7 +12,6 @@ diff -urN util-vserver-0.30.216-r2837.orig/distrib/defaults/poldek/poldek.conf u
 +
 +#hold =
 +ignore = kernel* udev devfs
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/Makefile.am util-vserver-0.30.216-r2837/distrib/Makefile.am
 --- util-vserver-0.30.216-r2837.orig/distrib/Makefile.am       2009-06-22 17:36:52.000000000 +0200
 +++ util-vserver-0.30.216-r2837/distrib/Makefile.am    2009-06-22 17:49:36.000000000 +0200
 @@ -45,6 +45,7 @@
@@ -24,31 +22,28 @@ diff -urN util-vserver-0.30.216-r2837.orig/distrib/Makefile.am util-vserver-0.30
                           template/initpost template/initpre \
                           rh9/apt/rpmpriorities    rh9/pkgs/01    rh9/pkgs/02 \
                           fc1/apt/rpmpriorities    fc1/pkgs/01    fc1/pkgs/02 \
-@@ -85,7 +86,10 @@
+@@ -85,7 +86,9 @@
                           suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \
                           suse91/rpm/macros \
                           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-ti/pkgs/01 pld-ti/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 \
-@@ -95,7 +99,10 @@
+@@ -95,7 +99,9 @@
                           fc5/apt/sources.list \
                           fc6/apt/sources.list \
                           f7/apt/sources.list \
 -                         suse91/apt/sources.list
 +                         suse91/apt/sources.list \
 +                         pld-ac/poldek/repos.d/pld.conf \
-+                         pld-th/poldek/repos.d/pld.conf \
-+                         pld-ti/poldek/repos.d/pld.conf
++                         pld-th/poldek/repos.d/pld.conf
  
  AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \
                        =  $(nobase_distrib_SCRIPTS)
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01 util-vserver-0.30.216-r2837/distrib/pld-ac/pkgs/01
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-ac/pkgs/01 2009-06-22 17:48:26.000000000 +0200
 @@ -0,0 +1,6 @@
@@ -58,12 +53,13 @@ diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/pkgs/01 util-vserver-0
 +issue
 +rpm-base
 +vserver-packages
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.conf    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-ac/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,64 @@
 +# $Id$
 +# PLD Linux Distribution <http://www.pld-linux.org/>.
++#
++# Main sources for PLD Linux 2.0 (Ac)
 +
 +# specify our packages architecture
 +_arch   = %ARCH%
@@ -75,20 +71,19 @@ diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.con
 +## You can use them if you have better connection there
 +# CI TASK:
 +#_prefix = ftp://ftp.task.pld-linux.org/dists/ac
-+#_prefix = %{_pld_main_prefix}
 +_prefix = %{_pld_main_prefix}
 +
 +_type = pndir
 +
-+# PLD 2.0 (Ac)
++# PLD Linux 2.0 (Ac)
 +[source]
 +type   = %{_type}
-+name   = ac
++name   = ac-main
 +path   = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
 +signed = yes
-+# buggy deps -- use one from updates instead
-+ignore = msmtp-sendmail*
 +pri    = 1
++# msmtp-sendmail is broken, yum noarch is older than in updates
++ignore = msmtp-sendmail* yum*
 +
 +[source]
 +type   = %{_type}
@@ -101,14 +96,15 @@ diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.con
 +type   = %{_type}
 +name   = ac-supported
 +path   = %{_prefix}/supported/%{_arch}/
++signed = yes
 +auto   = no
 +autoup = no
-+signed = yes
 +
 +[source]
 +type   = %{_type}
 +name   = ac-ready
 +path   = %{_pld_main_prefix}/ready/%{_arch}/
++#signed = yes
 +auto   = no
 +autoup = no
 +
@@ -118,176 +114,119 @@ diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/poldek/repos.d/pld.con
 +path   = %{_pld_main_prefix}/test/%{_arch}/
 +auto   = no
 +autoup = no
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ac/rpm/macros util-vserver-0.30.216-r2837/distrib/pld-ac/rpm/macros
++
++# ac-main + ac-updates
++[source]
++type   = group
++name   = ac
++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 @@
+@@ -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
-+%_netsharedpath               /dev
-+%_tmppath                     /tmp
-+%_host_os                     %_os
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-th/pkgs/01 util-vserver-0.30.216-r2837/distrib/pld-th/pkgs/01
 --- 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
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-th/poldek/repos.d/pld.conf util-vserver-0.30.216-r2837/distrib/pld-th/poldek/repos.d/pld.conf
 --- util-vserver-0.30.216-r2837.orig/distrib/pld-th/poldek/repos.d/pld.conf    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/distrib/pld-th/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,71 @@
 +# PLD Linux Distribution <http://www.pld-linux.org/>.
++#
++# Main sources for PLD Linux 3.0 (Th)
 +
++# specify our packages architecture
 +_arch   = %ARCH%
-+_prefix = ftp://ftp.th.pld-linux.org/dists/th
++
++# main PLD-site for often changed things (test, ready):
++_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
++
 +## Some mirrors
 +## You can use them if you have better connection there
 +# CI TASK:
 +#_prefix = ftp://ftp.task.pld-linux.org/dists/th
++_prefix = %{_pld_main_prefix}
 +
-+_type = pndir
-+
-+# PLD 3.0 (Th)
++# PLD Linux 3.0 (Th): main sources
 +[source]
-+type   = %{_type}
++type   = pndir
 +name   = th
 +path   = %{_prefix}/PLD/%{_arch}/RPMS/
 +
 +[source]
-+type   = %{_type}
++type   = pndir
 +name   = th
 +path   = %{_prefix}/PLD/noarch/RPMS/
 +
-+#[source]
-+#type   = %{_type}
-+#name   = th-updates
-+#path   = %{_prefix}/updates/%{_arch}/RPMS/
-+#
-+#[source]
-+#type   = %{_type}
-+#name   = th-updates
-+#path   = %{_prefix}/updates/noarch/RPMS/
++# PLD Linux 3.0 (Th): obsolete sources (kde3, ...)
++[source]
++type   = pndir
++name   = th-obsolete
++path   = %{_prefix}/obsolete/%{_arch}/RPMS/
++auto   = no
++autoup = no
 +
-+#[source]
-+#type   = %{_type}
-+#name   = th-supported
-+#path   = %{_prefix}/supported/%{_arch}/
-+#auto   = no
++[source]
++type   = pndir
++name   = th-obsolete
++path   = %{_prefix}/obsolete/noarch/RPMS/
++auto   = no
++autoup = no
 +
++# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main)
 +[source]
-+type   = %{_type}
++type   = pndir
 +name   = th-ready
-+path   = %{_prefix}/ready/%{_arch}/RPMS/
++path   = %{_pld_main_prefix}/ready/%{_arch}/RPMS/
 +auto   = no
 +autoup = no
 +
 +[source]
-+type   = %{_type}
++type   = pndir
 +name   = th-ready
-+path   = %{_prefix}/ready/noarch/RPMS/
++path   = %{_pld_main_prefix}/ready/noarch/RPMS/
 +auto   = no
 +autoup = no
 +
++# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready)
 +[source]
-+type   = %{_type}
++type   = pndir
 +name   = th-test
-+path   = %{_prefix}/test/%{_arch}/RPMS/
++path   = %{_pld_main_prefix}/test/%{_arch}/RPMS/
 +auto   = no
 +autoup = no
 +
 +[source]
-+type   = %{_type}
++type   = pndir
 +name   = th-test
-+path   = %{_prefix}/test/noarch/RPMS/
++path   = %{_pld_main_prefix}/test/noarch/RPMS/
 +auto   = no
 +autoup = no
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-th/rpm/macros util-vserver-0.30.216-r2837/distrib/pld-th/rpm/macros
 --- 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
-+%_netsharedpath               /dev
+@@ -0,0 +1,3 @@
++%_netsharedpath               /dev:/proc
 +%_tmppath                     /tmp
 +%_host_os                     %_os
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ti/pkgs/01 util-vserver-0.30.216-r2837/distrib/pld-ti/pkgs/01
---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/pkgs/01    1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.216-r2837/distrib/pld-ti/pkgs/01 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,6 @@
-+basesystem
-+filesystem
-+glibc-misc
-+issue
-+rpm-base
-+vserver-packages
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ti/poldek/repos.d/pld.conf util-vserver-0.30.216-r2837/distrib/pld-ti/poldek/repos.d/pld.conf
---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/poldek/repos.d/pld.conf    1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.216-r2837/distrib/pld-ti/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,46 @@
-+# PLD Titanium
-+# Unofficial version of PLD Linux Distribution
-+# http://www.pld-linux.org/Titanium
-+
-+_arch   = %ARCH%
-+_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium
-+
-+_type = pndir
-+
-+[source]
-+type   = %{_type}
-+name   = titanium
-+path   = %{_prefix}/PLD/%{_arch}/RPMS/
-+
-+[source]
-+type   = %{_type}
-+name   = titanium
-+path   = %{_prefix}/PLD/noarch/RPMS/
-+
-+[source]
-+type   = %{_type}
-+name   = titanium-ready
-+path   = %{_prefix}/ready/%{_arch}/RPMS/
-+auto   = no
-+autoup = no
-+
-+[source]
-+type   = %{_type}
-+name   = titanium-ready
-+path   = %{_prefix}/ready/noarch/RPMS/
-+auto   = no
-+autoup = no
-+
-+[source]
-+type   = %{_type}
-+name   = titanium-test
-+path   = %{_prefix}/test/%{_arch}/RPMS/
-+auto   = no
-+autoup = no
-+
-+[source]
-+type   = %{_type}
-+name   = titanium-test
-+path   = %{_prefix}/test/noarch/RPMS/
-+auto   = no
-+autoup = no
-diff -urN util-vserver-0.30.216-r2837.orig/distrib/pld-ti/rpm/macros util-vserver-0.30.216-r2837/distrib/pld-ti/rpm/macros
---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100
-+++ util-vserver-0.30.216-r2837/distrib/pld-ti/rpm/macros      2009-06-22 17:48:26.000000000 +0200
-@@ -0,0 +1,6 @@
+--- 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
-+%_netsharedpath               /dev
-+%_tmppath                     /tmp
-+%_host_os                     %_os
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/functions util-vserver-0.30.216-r2837/scripts/functions
 --- 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 @@
@@ -312,9 +251,9 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/functions util-vserver-0.30.2
  function _pkgMountBase
  {
 @@ -476,6 +490,7 @@
-           rpm)        _pkgSetVarsRPM;;
            apt)        _pkgSetVarsApt;;
            yum)        _pkgSetVarsYum;;
+           urpmi)      _pkgSetVarsUrpmi;;
 +          poldek)     _pkgSetVarsPoldek;;
            *)          echo "Unknown packaging flavor" >&2; exit 1;;
        esac
@@ -356,7 +295,6 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/functions util-vserver-0.30.2
  
  function vshelper.doSanityCheck
  {
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/Makefile-files util-vserver-0.30.216-r2837/scripts/Makefile-files
 --- util-vserver-0.30.216-r2837.orig/scripts/Makefile-files    2009-06-22 17:36:35.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/Makefile-files 2009-06-22 17:48:26.000000000 +0200
 @@ -21,6 +21,7 @@
@@ -367,15 +305,16 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/Makefile-files util-vserver-0
                                scripts/vrpm-preload \
                                scripts/save_s_context \
                                scripts/vservers.grabinfo.sh \
-@@ -48,11 +49,13 @@
+@@ -48,12 +49,14 @@
                                scripts/vserver-build.template \
                                scripts/vserver-build.rsync \
                                scripts/vserver-build.clone \
 +                              scripts/vserver-build.poldek \
                                scripts/vserver-build.functions \
                                scripts/vserver-build.functions.apt \
-                               scripts/vserver-build.functions.rpm \
                                scripts/vserver-build.functions.pkgmgmt \
+                               scripts/vserver-build.functions.rpm \
+                               scripts/vserver-build.functions.urpmi \
                                scripts/vserver-build.functions.yum \
 +                              scripts/vserver-build.functions.poldek \
                                scripts/vserver-setup.functions \
@@ -397,15 +336,14 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/Makefile-files util-vserver-0
                                scripts/vdispatch-conf \
                                scripts/vemerge \
                                scripts/vesync \
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt util-vserver-0.30.216-r2837/scripts/pkgmgmt
 --- util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt   2009-06-22 17:36:34.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/pkgmgmt        2009-06-22 17:48:26.000000000 +0200
 @@ -195,7 +195,7 @@
  "
      
      case $2 in
--      (RH)    pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum "${YUM_RELEASEPKGS[@]}")
-+      (RH)    pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum poldek "${YUM_RELEASEPKGS[@]}")
+-      (RH)    pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi "${YUM_RELEASEPKGS[@]}")
++      (RH)    pkgs=$(vrpm "$1" -- -q --qf '---%{NAME}---\n' rpm apt yum urpmi poldek "${YUM_RELEASEPKGS[@]}")
                hasSubstring "$pkgs" ---rpm--- || {
                    warning "$ERR
  * The vserver does not seem to have the 'rpm' package which is required
@@ -413,8 +351,8 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt util-vserver-0.30.216
                    ERR=
                }
                
--              hasSubstring "$pkgs"  ---apt--- ---yum--- || {
-+              hasSubstring "$pkgs"  ---apt--- ---yum--- ---poldek--- || {
+-              hasSubstring "$pkgs"  ---apt--- ---yum--- ---urpmi--- || {
++              hasSubstring "$pkgs"  ---apt--- ---yum--- ---urpmi--- ---poldek--- || {
                    warning "$ERR
 -* The vserver does not seem to have a depsolver like 'apt' or 'yum'
 +* The vserver does not seem to have a depsolver like 'apt', 'yum' or 'poldek'
@@ -561,7 +499,6 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/pkgmgmt util-vserver-0.30.216
        (debian)                processVserver_Debian "$vserver" "$IS_INTERNALIZE";;
        (*)
            echo $"Vserver style '$style' is not supported for packagemanagment" >&2
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst util-vserver-0.30.216-r2837/scripts/util-vserver-vars.pathsubst
 --- util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst       2009-06-22 17:36:34.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/util-vserver-vars.pathsubst    2009-06-22 17:48:26.000000000 +0200
 @@ -54,6 +54,7 @@
@@ -581,7 +518,6 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/util-vserver-vars.pathsubst u
  
  _AWK="@AWK@"
  _BZIP2="@BZIP2@"
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpkg util-vserver-0.30.216-r2837/scripts/vpkg
 --- util-vserver-0.30.216-r2837.orig/scripts/vpkg      2009-06-22 17:36:34.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/vpkg   2009-06-22 17:48:26.000000000 +0200
 @@ -115,6 +115,44 @@
@@ -629,7 +565,6 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpkg util-vserver-0.30.216-r2
      (debian)
        case "$tag" in
            (get-conffiles)
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpoldek util-vserver-0.30.216-r2837/scripts/vpoldek
 --- util-vserver-0.30.216-r2837.orig/scripts/vpoldek   1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/scripts/vpoldek        2009-06-22 17:48:26.000000000 +0200
 @@ -0,0 +1,74 @@
@@ -707,7 +642,6 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpoldek util-vserver-0.30.216
 +
 +test ${#poldek_opts[@]} -eq 0 || poldek_opts=( "${poldek_opts[@]}" -- )
 +exec $_VSOMETHING "${send_through[@]}" poldek "${poldek_opts[@]}" "$@"
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker util-vserver-0.30.216-r2837/scripts/vpoldek-worker
 --- util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker    1970-01-01 01:00:00.000000000 +0100
 +++ util-vserver-0.30.216-r2837/scripts/vpoldek-worker 2009-06-22 17:48:26.000000000 +0200
 @@ -0,0 +1,45 @@
@@ -756,13 +690,12 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/vpoldek-worker util-vserver-0
 +      --conf=$POLDEK_CONFIG \
 +      --pmcmd=$RPM_BINARY \
 +      "$@"
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build util-vserver-0.30.216-r2837/scripts/vserver-build
 --- util-vserver-0.30.216-r2837.orig/scripts/vserver-build     2009-06-22 17:36:34.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/vserver-build  2009-06-22 17:48:26.000000000 +0200
 @@ -57,6 +57,9 @@
-     yum         ... -- -d <distribution>
                  ...  installs the base-packages of the given distribution with
                     help of 'vyum'
+     urpmi       ... -- -d <distribution> -m <mirror>
 +    poldek      ... -- -d <distribution>
 +                ...  installs the base-packages of the given distribution with
 +                   help of 'vpoldek'
@@ -773,12 +706,11 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build util-vserver-0.
  
  case x"$method" in
      (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;;
--    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone)
-+    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xpoldek)
+-    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi)
++    (xapt-rpm|xcopy|xskeleton|xdebootstrap|xyum|xrpm|xtemplate|xfai|xrsync|xclone|xurpmi|xpoldek)
                . $__PKGLIBDIR/vserver-build.$method
                ;;
      (x)               panic $"No build-method specified";;
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions util-vserver-0.30.216-r2837/scripts/vserver-build.functions
 --- util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions   2009-06-22 17:36:35.000000000 +0200
 +++ util-vserver-0.30.216-r2837/scripts/vserver-build.functions        2009-06-22 17:48:26.000000000 +0200
 @@ -170,6 +170,12 @@
@@ -794,10 +726,9 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions util-
        elif test -n "$1"; then
            DISTRIBUTION=$1
        else
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.poldek util-vserver-0.30.216-r2837/scripts/vserver-build.functions.poldek
 --- 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>
@@ -876,10 +807,11 @@ diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.functions.polde
 +              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
 +}
-diff -urN util-vserver-0.30.216-r2837.orig/scripts/vserver-build.poldek util-vserver-0.30.216-r2837/scripts/vserver-build.poldek
 --- 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
 @@ -0,0 +1,65 @@
This page took 0.082159 seconds and 4 git commands to generate.