OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Aug-2003 20:55:47
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082219554700
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec
Log:
remove version number from rpmpopt file
Summary:
Revision Changes Path
1.192.2.6 +3 -2 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.5 -r1.192.2.6 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Aug 2003 18:43:43 -0000 1.192.2.5
+++ openpkg-src/openpkg/openpkg.spec 22 Aug 2003 18:55:47 -0000 1.192.2.6
@@ -475,6 +475,7 @@
-e 's;LDFLAGS_STATIC="[^"]*";LDFLAGS_STATIC="";g' \
-e "s;SYSCONFIGDIR=.*;SYSCONFIGDIR='%{l_prefix}/etc/openpkg';" \
-e 's;db-[0-9][0-9.]*;db;g' \
+ -e 's;/rpmpopt-${VERSION};/rpmpopt;' \
<configure >configure.n && \
mv configure.n configure
sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
@@ -737,7 +738,7 @@
# adjust RPM configuration files
cat `SOURCE rpmpopt` \
- >>$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmpopt-%{V_rpm}
+ >>$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmpopt
test -d $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg || \
mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg
sed -e "s:@l_prefix@:%{l_prefix}:g" \
@@ -823,7 +824,7 @@
%{l_prefix}/lib/openpkg/rpme
%{l_prefix}/lib/openpkg/rpmi
%{l_prefix}/lib/openpkg/rpmk
- %{l_prefix}/lib/openpkg/rpmpopt-%{V_rpm}
+ %{l_prefix}/lib/openpkg/rpmpopt
%{l_prefix}/lib/openpkg/rpmq
%{l_prefix}/lib/openpkg/rpmt
%{l_prefix}/lib/openpkg/rpmtool
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]