OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Feb-2007 19:53:56
Branch: HEAD Handle: 2007021118535600
Modified files:
openpkg-src/urpmi urpmi.spec
Log:
fix path and new urpmi::media API. Submitted by: PLI
<[EMAIL PROTECTED]>
Summary:
Revision Changes Path
1.40 +12 -8 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 10 Feb 2007 14:02:27 -0000 1.39
+++ openpkg-src/urpmi/urpmi.spec 11 Feb 2007 18:53:56 -0000 1.40
@@ -45,7 +45,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20070210
+Release: 20070211
# package options
%option with_wget no
@@ -139,13 +139,14 @@
%{l_shtool} subst \
-e "s;/var/lib/urpmi;%{l_prefix}/var/urpmi/lib;" \
-e "s;/var/cache/urpmi;%{l_prefix}/var/urpmi/cache;" \
+ -e "s;/var/lib/rpm;%{l_prefix}/RPM/DB;" \
urpm.pm
# fix superuser message (l_muid)
%{l_shtool} subst \
-e "s;$< != 0;$< != %{l_muid};" \
-e 's;Only superuser is allowed;Only %{l_musr} is allowed;' \
- urpmi.addmedia urpmi.update urpmi.removemedia rurpmi urpmi urpmq
+ urpmi.addmedia urpmi.update urpmi.removemedia rurpm* urpmi urpmq
%{l_shtool} subst \
-e "s;$<;($< != %{l_muid});" \
-e 's;Only superuser is allowed;Only %{l_musr} is allowed;' \
@@ -156,7 +157,7 @@
-e "s;/bin/cp;%{l_prefix}/bin/gcp;" \
-e "s;/bin/mv;%{l_prefix}/bin/gmv;" \
-e "s;/usr/bin/md5sum;%{l_prefix}/bin/urpmi.md5sum;" \
- urpm/util.pm
+ urpm/*.pm
%{l_shtool} subst \
-e "s;/usr/bin/curl;%{l_prefix}/lib/openpkg/curl;" \
%if "%{with_wget}" == "yes"
@@ -172,8 +173,11 @@
) || exit $?
( cd rpmtools-%{V_rpmtools}
%{l_shtool} subst \
- -e 's;/usr/bin/md5sum;%{l_prefix}/bin/urpmi.md5sum;g' \
- genhdlist
+ -e "s;/bin/cp;%{l_prefix}/bin/gcp;" \
+ -e "s;/bin/mv;%{l_prefix}/bin/gmv;" \
+ -e "s;/usr/bin/md5sum;%{l_prefix}/bin/urpmi.md5sum;" \
+ -e "s;/bin/gzip;%{l_prefix}/lib/openpkg/gzip;" \
+ genhdlist gendistrib rpm2cpio.pl
) || exit $?
# install addon Perl modules
@@ -224,11 +228,11 @@
%post
# update media information
- $RPM_INSTALL_PREFIX/bin/perl -Murpm -e '
+ $RPM_INSTALL_PREFIX/bin/perl -Murpm::media -e '
if (-e "$ARGV[0]/etc/urpmi/urpmi.cfg") {
$urpm = new urpm;
- $urpm->read_config;
- $urpm->update_media(nolock => 1, nopubkey => 1);
+ urpm::media::read_config($urpm);
+ urpm::media::update_media($urpm, nolock => 1, nopubkey => 1);
}
' $RPM_INSTALL_PREFIX
exit 0
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
