OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Jan-2003 15:39:17
Branch: HEAD Handle: 2003010214391700
Modified files:
openpkg-re openpkg-dev
Log:
Oooops, always use the rpm from the instance we are working on...
Summary:
Revision Changes Path
1.45 +6 -6 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.44 -r1.45 openpkg-dev
--- openpkg-re/openpkg-dev 30 Dec 2002 20:56:54 -0000 1.44
+++ openpkg-re/openpkg-dev 2 Jan 2003 14:39:17 -0000 1.45
@@ -371,15 +371,15 @@
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
cvs_rev=`cd ${OPENPKG_WORK}; cvs stat src/${name}/${name}.spec 2>/dev/null
| awk '/Repository revision:/ { print $3; }'`
cvs co -p -r${cvs_rev} openpkg-src/${name}/${name}.spec >${tmpfile}
2>/dev/null
- rpm_version_old=`rpm -q --qf "%{VERSION}" --specfile ${tmpfile} 2>/dev/null`
- rpm_release_old=`rpm -q --qf "%{RELEASE}" --specfile ${tmpfile} 2>/dev/null`
+ rpm_version_old=`${OPENPKG_INST}/bin/rpm -q --qf "%{VERSION}" --specfile
${tmpfile} 2>/dev/null`
+ rpm_release_old=`${OPENPKG_INST}/bin/rpm -q --qf "%{RELEASE}" --specfile
${tmpfile} 2>/dev/null`
rm -f ${tmpfile}
echo "++ determine information about new version"
- rpm_version_new=`rpm -q --qf "%{VERSION}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_release_new=`rpm -q --qf "%{RELEASE}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_name=`rpm -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_summary=`rpm -q --qf "%{SUMMARY}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_version_new=`${OPENPKG_INST}/bin/rpm -q --qf "%{VERSION}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_release_new=`${OPENPKG_INST}/bin/rpm -q --qf "%{RELEASE}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_name=`${OPENPKG_INST}/bin/rpm -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_summary=`${OPENPKG_INST}/bin/rpm -q --qf "%{SUMMARY}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
echo "++ releasing ${basename}.src.rpm to OpenPKG distribution area"
if [ ${dry} -eq 0 ]; then
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]