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 openpkg-web Date: 21-Jul-2003 14:16:58
Branch: HEAD Handle: 2003072113165007
Modified files:
openpkg-src/bochs bochs.spec
openpkg-src/docbook docbook.spec
openpkg-src/findutils findutils.spec
openpkg-src/inn inn.spec
openpkg-src/instant instant.spec
openpkg-src/latex2html latex2html.spec
openpkg-src/nsd nsd.spec
openpkg-src/pks pks.spec
openpkg-src/rt rt.spec
openpkg-src/sgml sgml.spec
openpkg-src/tex4ht tex4ht.spec
openpkg-web news.txt
Log:
PR#164: replace remaining occurrences of hard-coded %{l_prefix} in
%{pre,post,preun,postun} sections with intended to be consists over
all packages and to allow relocation (at least in theory)
Summary:
Revision Changes Path
1.22 +2 -2 openpkg-src/bochs/bochs.spec
1.58 +3 -3 openpkg-src/docbook/docbook.spec
1.33 +4 -2 openpkg-src/findutils/findutils.spec
1.76 +2 -2 openpkg-src/inn/inn.spec
1.26 +3 -7 openpkg-src/instant/instant.spec
1.7 +8 -9 openpkg-src/latex2html/latex2html.spec
1.21 +1 -1 openpkg-src/nsd/nsd.spec
1.21 +17 -17 openpkg-src/pks/pks.spec
1.85 +8 -8 openpkg-src/rt/rt.spec
1.31 +4 -4 openpkg-src/sgml/sgml.spec
1.8 +3 -9 openpkg-src/tex4ht/tex4ht.spec
1.5687 +8 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bochs/bochs.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 bochs.spec
--- openpkg-src/bochs/bochs.spec 8 Jul 2003 14:38:49 -0000 1.21
+++ openpkg-src/bochs/bochs.spec 21 Jul 2003 12:16:52 -0000 1.22
@@ -33,7 +33,7 @@
Group: Misc
License: LGPL
Version: 2.0.2
-Release: 20030612
+Release: 20030721
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/bochs/bochs-%{version}.tar.gz
@@ -167,7 +167,7 @@
( echo "Hint: This Bochs package has a FreeDOS image pre-installed"
echo "In order to run it as a regular user, you either have to"
echo "change the permissions and/or the ownership of the image file"
- echo "%{l_prefix}/share/bochs/img/freedos.img manually."
+ echo "$RPM_INSTALL_PREFIX/share/bochs/img/freedos.img manually."
) | %{l_rpmtool} msg -b -t notice
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/docbook/docbook.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 docbook.spec
--- openpkg-src/docbook/docbook.spec 8 Jul 2003 14:39:20 -0000 1.57
+++ openpkg-src/docbook/docbook.spec 21 Jul 2003 12:16:52 -0000 1.58
@@ -44,7 +44,7 @@
Group: SGML
License: BSD
Version: 4.2
-Release: 20030708
+Release: 20030721
# list of sources
Source0:
http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
@@ -186,7 +186,7 @@
%post
if [ $1 -eq 1 ]; then
- %{l_prefix}/bin/sgmlcatalog \
+ $RPM_INSTALL_PREFIX/bin/sgmlcatalog \
-p "ISO 8879:1986" \
-s "ISO 8879:1986//ENTITIES" \
-i iso8879-sgml \
@@ -259,7 +259,7 @@
%preun
if [ $1 -eq 0 ]; then
- %{l_prefix}/bin/sgmlcatalog \
+ $RPM_INSTALL_PREFIX/bin/sgmlcatalog \
-d iso8879-sgml \
-x \
-d docbook-dtd-xml-old \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/findutils/findutils.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 findutils.spec
--- openpkg-src/findutils/findutils.spec 19 Jul 2003 17:05:54 -0000 1.32
+++ openpkg-src/findutils/findutils.spec 21 Jul 2003 12:16:53 -0000 1.33
@@ -33,7 +33,7 @@
Group: Utility
License: GPL
Version: 4.1.20
-Release: 20030719
+Release: 20030721
# list of sources
Source0: ftp://alpha.gnu.org/gnu/findutils/findutils-%{version}.tar.gz
@@ -88,5 +88,7 @@
rm -rf $RPM_BUILD_ROOT
%preun
- rm -f $RPM_BUILD_ROOT%{l_prefix}/var/findutils/locatedb >/dev/null 2>&1 || true
+ if [ $1 -eq 0 ]; then
+ rm -f $RPM_INSTALL_PREFIX/var/findutils/locatedb >/dev/null 2>&1 || true
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/inn.spec
============================================================================
$ cvs diff -u -r1.75 -r1.76 inn.spec
--- openpkg-src/inn/inn.spec 19 Jul 2003 17:05:58 -0000 1.75
+++ openpkg-src/inn/inn.spec 21 Jul 2003 12:16:53 -0000 1.76
@@ -33,7 +33,7 @@
Group: News
License: ISC
Version: 2.4.0
-Release: 20030719
+Release: 20030721
# package options
%option with_fsl yes
@@ -243,6 +243,6 @@
%post
if [ $1 -eq 1 ]; then
# create history db as restricted user
- su - %{l_rusr} -c "%{l_prefix}/libexec/inn/makedbz -i -o"
+ su - %{l_rusr} -c "$RPM_INSTALL_PREFIX/libexec/inn/makedbz -i -o"
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/instant/instant.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 instant.spec
--- openpkg-src/instant/instant.spec 9 Jul 2003 13:27:29 -0000 1.25
+++ openpkg-src/instant/instant.spec 21 Jul 2003 12:16:54 -0000 1.26
@@ -33,7 +33,7 @@
Group: SGML
License: BSD
Version: 1.0
-Release: 20030709
+Release: 20030721
# list of sources
Source0: instant-%{version}.tar.gz
@@ -87,15 +87,11 @@
%post
if [ $1 -eq 1 ]; then
- %{l_prefix}/bin/sgmlcatalog \
- -p "-//OSF//DTD transpec" \
- -x \
- -i transpec
+ $RPM_INSTALL_PREFIX/bin/sgmlcatalog -p "-//OSF//DTD transpec" -x -i transpec
fi
%preun
if [ $1 -eq 0 ]; then
- %{l_prefix}/bin/sgmlcatalog \
- -d transpec
+ $RPM_INSTALL_PREFIX/bin/sgmlcatalog -d transpec
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/latex2html/latex2html.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 latex2html.spec
--- openpkg-src/latex2html/latex2html.spec 8 Jul 2003 14:40:23 -0000 1.6
+++ openpkg-src/latex2html/latex2html.spec 21 Jul 2003 12:16:54 -0000 1.7
@@ -37,7 +37,7 @@
Group: Text
License: GPL
Version: %{V_opkg}
-Release: 20030704
+Release: 20030721
# list of sources
Source0:
http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/latex2html-%{V_dist}.tar.gz
@@ -105,12 +105,11 @@
rm -rf $RPM_BUILD_ROOT
%post
- echo "Running mktexlsr to rebuild teTeX ls-R database..." |\
- %{l_rpmtool} msg -t notice
- %{l_prefix}/bin/mktexlsr
-
-%postun
- echo "Running mktexlsr to rebuild teTeX ls-R database..." |\
- %{l_rpmtool} msg -t notice
- %{l_prefix}/bin/mktexlsr
+ echo "Running mktexlsr to rebuild teTeX ls-R database..." | %{l_rpmtool} msg -t
notice
+ $RPM_INSTALL_PREFIX/bin/mktexlsr
+
+%preun
+ if [ $1 -eq 0 ]; then
+ rm -f $RPM_INSTALL_PREFIX/share/texmf/ls-R >/dev/null 2>&1 || true
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nsd/nsd.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 nsd.spec
--- openpkg-src/nsd/nsd.spec 21 Jul 2003 08:12:40 -0000 1.20
+++ openpkg-src/nsd/nsd.spec 21 Jul 2003 12:16:55 -0000 1.21
@@ -160,5 +160,5 @@
%post
# update database
- %{l_prefix}/sbin/nsdc rebuild
+ $RPM_INSTALL_PREFIX/sbin/nsdc rebuild
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 pks.spec
--- openpkg-src/pks/pks.spec 21 Jul 2003 08:40:40 -0000 1.20
+++ openpkg-src/pks/pks.spec 21 Jul 2003 12:16:56 -0000 1.21
@@ -154,22 +154,22 @@
%post
if [ $1 -eq 1 ]; then
# create initial database
- su - %{l_rusr} -c "%{l_prefix}/bin/pksclient \
- %{l_prefix}/var/pks/db create" >/dev/null 2>&1
- su - %{l_rusr} -c "%{l_prefix}/bin/pksclient \
- %{l_prefix}/var/pks/db add %{l_prefix}/etc/openpkg/openpkg.pgp"
>/dev/null 2>&1
+ su - %{l_rusr} -c "$RPM_INSTALL_PREFIX/bin/pksclient \
+ $RPM_INSTALL_PREFIX/var/pks/db create" >/dev/null 2>&1
+ su - %{l_rusr} -c "$RPM_INSTALL_PREFIX/bin/pksclient \
+ $RPM_INSTALL_PREFIX/var/pks/db add
$RPM_INSTALL_PREFIX/etc/openpkg/openpkg.pgp" >/dev/null 2>&1
# activate in MTA configuration
- aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
- aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ aliases_update=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
( echo "pks: pks-request"
- echo "pks-request: \"|%{l_prefix}/bin/pks-mail
%{l_prefix}/etc/pks/pksd.conf\""
+ echo "pks-request: \"|$RPM_INSTALL_PREFIX/bin/pks-mail
$RPM_INSTALL_PREFIX/etc/pks/pksd.conf\""
echo "pks-daemon: MAILER-DAEMON"
echo "pks-admin: postmaster"
echo "pgp-public-keys: pks-request"
echo "pgp: pks-request"
- ) | %{l_rpmtool} config -a -i "%{l_prefix}:pks" $aliases_file
+ ) | %{l_rpmtool} config -a -i "$RPM_INSTALL_PREFIX:pks" $aliases_file
fi
if [ ".$aliases_update" != . ]; then
eval $aliases_update
@@ -179,23 +179,23 @@
%preun
if [ $1 -eq 0 ]; then
# stop perhaps still running server
- %{l_prefix}/etc/rc pks stop >/dev/null 2>&1 || true
+ $RPM_INSTALL_PREFIX/etc/rc pks stop >/dev/null 2>&1 || true
# deactivate in MTA configuration
- aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
- aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ aliases_update=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
- %{l_rpmtool} config -r -i "%{l_prefix}:pks" $aliases_file
+ %{l_rpmtool} config -r -i "$RPM_INSTALL_PREFIX:pks" $aliases_file
fi
if [ ".$aliases_update" != . ]; then
eval $aliases_update
fi
# remove generated files
- rm -f %{l_prefix}/var/pks/pksd.ctl >/dev/null 2>&1 || true
- rm -f %{l_prefix}/var/pks/pksd.log >/dev/null 2>&1 || true
- rm -f %{l_prefix}/var/pks/pks-queue-run.pid >/dev/null 2>&1 || true
- rm -f %{l_prefix}/var/pks/queue/* >/dev/null 2>&1 || true
- rm -f %{l_prefix}/var/pks/db/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/pksd.ctl >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/pksd.log >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/pks-queue-run.pid >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/queue/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/pks/db/* >/dev/null 2>&1 || true
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 rt.spec
--- openpkg-src/rt/rt.spec 21 Jul 2003 07:19:43 -0000 1.84
+++ openpkg-src/rt/rt.spec 21 Jul 2003 12:16:56 -0000 1.85
@@ -362,12 +362,12 @@
%post
if [ $1 -eq 1 ]; then
# activate in MTA configuration
- aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
- aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ aliases_update=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
- ( echo "rt: \"|%{l_prefix}/bin/rt-mailgate --action correspond
--queue general --url http://127.0.0.1:8380/\"";
- echo "rt-comment: \"|%{l_prefix}/bin/rt-mailgate --action comment
--queue general --url http://127.0.0.1:8380/\"";
- ) | %{l_rpmtool} config -a -i "%{l_prefix}:rt" $aliases_file
+ ( echo "rt: \"|$RPM_INSTALL_PREFIX/bin/rt-mailgate --action
correspond --queue general --url http://127.0.0.1:8380/\"";
+ echo "rt-comment: \"|$RPM_INSTALL_PREFIX/bin/rt-mailgate --action
comment --queue general --url http://127.0.0.1:8380/\"";
+ ) | %{l_rpmtool} config -a -i "$RPM_INSTALL_PREFIX:rt" $aliases_file
fi
if [ ".$aliases_update" != . ]; then
eval $aliases_update
@@ -395,10 +395,10 @@
$RPM_INSTALL_PREFIX/etc/rc rt stop
# deactivate in MTA configuration
- aliases_file=`%{l_prefix}/etc/rc --query MTA_aliases_file`
- aliases_update=`%{l_prefix}/etc/rc --query MTA_aliases_update`
+ aliases_file=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_file`
+ aliases_update=`$RPM_INSTALL_PREFIX/etc/rc --query MTA_aliases_update`
if [ ".$aliases_file" != . ]; then
- %{l_rpmtool} config -r -i "%{l_prefix}:rt" $aliases_file
+ %{l_rpmtool} config -r -i "$RPM_INSTALL_PREFIX:rt" $aliases_file
fi
if [ ".$aliases_update" != . ]; then
eval $aliases_update
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sgml/sgml.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 sgml.spec
--- openpkg-src/sgml/sgml.spec 17 Jul 2003 15:33:17 -0000 1.30
+++ openpkg-src/sgml/sgml.spec 21 Jul 2003 12:16:57 -0000 1.31
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: SGML
License: PD
-Version: 20030707
-Release: 20030717
+Version: 20030721
+Release: 20030721
# list of sources
Source0: mkcatalog
@@ -83,7 +83,7 @@
%preun
if [ $1 -eq 0 ]; then
- rm -f %{l_prefix}/share/sgml/catalog
- rm -f %{l_prefix}/share/sgml/catalog.xml
+ rm -f $RPM_INSTALL_PREFIX/share/sgml/catalog
+ rm -f $RPM_INSTALL_PREFIX/share/sgml/catalog.xml
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tex4ht/tex4ht.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 tex4ht.spec
--- openpkg-src/tex4ht/tex4ht.spec 17 Jul 2003 15:33:25 -0000 1.7
+++ openpkg-src/tex4ht/tex4ht.spec 21 Jul 2003 12:16:57 -0000 1.8
@@ -33,7 +33,7 @@
Group: Text
License: LPPL
Version: 20030119
-Release: 20030717
+Release: 20030721
# list of sources
Source0: http://www.cis.ohio-state.edu/~gurari/TeX4ht/ufiles.zip
@@ -139,12 +139,6 @@
rm -rf $RPM_BUILD_ROOT
%post
- echo "Running mktexlsr to rebuild teTeX ls-R database..." |\
- %{l_rpmtool} msg -t notice
- %{l_prefix}/bin/mktexlsr 2>&1 >/dev/null || true
-
-%postun
- echo "Running mktexlsr to rebuild teTeX ls-R database..." |\
- %{l_rpmtool} msg -t notice
- %{l_prefix}/bin/mktexlsr 2>&1 >/dev/null || true
+ echo "Running mktexlsr to rebuild teTeX ls-R database..." | %{l_rpmtool} msg -t
notice
+ $RPM_INSTALL_PREFIX/bin/mktexlsr 2>&1 >/dev/null || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5686 -r1.5687 news.txt
--- openpkg-web/news.txt 21 Jul 2003 12:08:34 -0000 1.5686
+++ openpkg-web/news.txt 21 Jul 2003 12:16:50 -0000 1.5687
@@ -1,3 +1,11 @@
+21-Jul-2003: Upgraded package: P<tex4ht-20030119-20030721>
+21-Jul-2003: Upgraded package: P<sgml-20030721-20030721>
+21-Jul-2003: Upgraded package: P<latex2html-2002.2.1-20030721>
+21-Jul-2003: Upgraded package: P<instant-1.0-20030721>
+21-Jul-2003: Upgraded package: P<inn-2.4.0-20030721>
+21-Jul-2003: Upgraded package: P<findutils-4.1.20-20030721>
+21-Jul-2003: Upgraded package: P<docbook-4.2-20030721>
+21-Jul-2003: Upgraded package: P<bochs-2.0.2-20030721>
21-Jul-2003: Upgraded package: P<samba-2.2.8a-20030721>
21-Jul-2003: Upgraded package: P<tcl-8.4.3-20030721>
21-Jul-2003: Upgraded package: P<openpkg-20030721-20030721>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
