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: 08-Jun-2007 08:33:41
Branch: HEAD Handle: 2007060807334000
Modified files:
openpkg-src/urpmi urpmi.spec
Log:
fix unpacking and cleanup style
Summary:
Revision Changes Path
1.59 +7 -7 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 7 Jun 2007 15:01:40 -0000 1.58
+++ openpkg-src/urpmi/urpmi.spec 8 Jun 2007 06:33:40 -0000 1.59
@@ -45,7 +45,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20070607
+Release: 20070608
# package options
%option with_wget no
@@ -118,7 +118,7 @@
%{l_rpm2cpio} %{SOURCE rpmtools-%{V_rpmtools_rpm}.src.rpm}
| cpio -idvmu
%{l_bzip2} -d -c urpmi-%{V_urpmi}.tar.bz2
| %{l_tar} xf -
%{l_bzip2} -d -c URPM-%{V_urpm}.tar.bz2
| %{l_tar} xf -
- %{l_bzip2} -d -c MDV-Packdrakeng-%{V_mdv_packdrakeng}.tar.bz2
| %{l_tar} xf -
+ %{l_gzip} -d -c MDV-Packdrakeng-%{V_mdv_packdrakeng}.tar.gz
| %{l_tar} xf -
%{l_gzip} -d -c MDV-Distribconf-%{V_mdv_distribconf}.tar.gz
| %{l_tar} xf -
%{l_bzip2} -d -c rpmtools-%{V_rpmtools}.tar.bz2
| %{l_tar} xf -
%patch -p0
@@ -136,11 +136,11 @@
urpmq urpm/cfg.pm urpm.pm
# adjust cache and hdlist paths
- %{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 urpmi
+ %{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 urpmi
# fix superuser message (l_muid)
%{l_shtool} subst \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
