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: 14-Nov-2006 10:24:05
Branch: HEAD Handle: 2006111409240500
Modified files:
openpkg-src/urpmi urpmi.spec
Log:
remove some %files stuff I don't understand the reason for and which
breaks my own tests; use coreutils non-legacy names; tell people about
management user and not superuser
Summary:
Revision Changes Path
1.21 +4 -4 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 14 Nov 2006 08:49:51 -0000 1.20
+++ openpkg-src/urpmi/urpmi.spec 14 Nov 2006 09:24:05 -0000 1.21
@@ -144,15 +144,17 @@
# 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
%{l_shtool} subst \
-e "s;$<;($< != %{l_muid});" \
+ -e 's;Only superuser is allowed;Only %{l_musr} is allowed;' \
urpme urpmi.recover urpm.pm
# fix common tool paths (coreutils)
%{l_shtool} subst \
- -e "s;/bin/cp;%{l_prefix}/bin/cp;" \
- -e "s;/bin/mv;%{l_prefix}/bin/mv;" \
+ -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
%{l_shtool} subst \
@@ -212,8 +214,6 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} `cat perl-openpkg-files` \
- '%dir %{l_prefix}/var/urpmi/*' \
- '%not %dir %{l_prefix}/etc/urpmi' \
'%config %{l_prefix}/etc/urpmi/inst.list' \
'%config %{l_prefix}/etc/urpmi/skip.list'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
