OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 21-Jul-2003 11:56:59
Branch: HEAD Handle: 2003072110565207
Modified files:
openpkg-src/djbdns djbdns.spec
openpkg-src/dss dss.spec
openpkg-src/jitterbug jitterbug.spec
openpkg-src/lyx lyx.spec
openpkg-src/monit monit.spec
openpkg-src/mysql mysql.spec
openpkg-src/mysql3 mysql3.spec
openpkg-src/powerdns powerdns.spec
openpkg-src/tripwire tripwire.spec
openpkg-src/whoson whoson.spec
openpkg-web news.txt
Log:
speclint police: use %{l_value ...} in shtool subst and for uid/gid,
too
Summary:
Revision Changes Path
1.13 +2 -4 openpkg-src/djbdns/djbdns.spec
1.25 +2 -3 openpkg-src/dss/dss.spec
1.34 +2 -11 openpkg-src/jitterbug/jitterbug.spec
1.17 +2 -3 openpkg-src/lyx/lyx.spec
1.19 +1 -2 openpkg-src/monit/monit.spec
1.69 +2 -4 openpkg-src/mysql/mysql.spec
1.15 +2 -4 openpkg-src/mysql3/mysql3.spec
1.27 +1 -2 openpkg-src/powerdns/powerdns.spec
1.20 +1 -2 openpkg-src/tripwire/tripwire.spec
1.16 +1 -4 openpkg-src/whoson/whoson.spec
1.5681 +4 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/djbdns/djbdns.spec
============================================================================
$ cvs diff -u -r1.12 -r1.13 djbdns.spec
--- openpkg-src/djbdns/djbdns.spec 19 Jul 2003 17:05:52 -0000 1.12
+++ openpkg-src/djbdns/djbdns.spec 21 Jul 2003 09:56:54 -0000 1.13
@@ -37,7 +37,7 @@
Group: Misc
License: GPL
Version: %{V_djbdns}
-Release: 20030719
+Release: 20030721
# list of sources
Source0: http://cr.yp.to/djbdns/djbdns-%{V_djbdns}.tar.gz
@@ -123,9 +123,7 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE djbdnssetup} \
$RPM_BUILD_ROOT%{l_prefix}/sbin/
- %{l_shtool} install -c -m 755 \
- -e 's;@l_ruid@;%{l_ruid};g' \
- -e 's;@l_rgid@;%{l_rgid};g' \
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE djbdnsrunsvc} \
$RPM_BUILD_ROOT%{l_prefix}/libexec/djbdns/bin/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dss/dss.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 dss.spec
--- openpkg-src/dss/dss.spec 19 Jul 2003 17:05:53 -0000 1.24
+++ openpkg-src/dss/dss.spec 21 Jul 2003 09:56:54 -0000 1.25
@@ -37,7 +37,7 @@
Group: Video
License: APSL
Version: %{V_opkg}
-Release: 20030719
+Release: 20030721
# list of sources
Source0:
http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@@ -117,8 +117,7 @@
-e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \
WebAdmin/WebAdminHtml/*.pl \
WebAdmin/WebAdminHtml/*.cgi
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
qtaccess
%{l_shtool} echo \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jitterbug/jitterbug.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 jitterbug.spec
--- openpkg-src/jitterbug/jitterbug.spec 17 Jul 2003 18:29:53 -0000 1.33
+++ openpkg-src/jitterbug/jitterbug.spec 21 Jul 2003 09:56:55 -0000 1.34
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 1.6.2.3
-Release: 20030717
+Release: 20030721
# list of sources
Source0: ossp-jitterbug-%{version}.tar.gz
@@ -77,18 +77,9 @@
( cd config
l_hostname=`%{l_shtool} echo -e %h`
l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
- %{l_shtool} subst -v \
+ %{l_shtool} subst -v %{l_value -s -a} \
-e "s;@l_hostname@;$l_hostname;g" \
-e "s;@l_domainname@;$l_domainname;g" \
- -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_musr@;%{l_musr};g' \
- -e 's;@l_muid@;%{l_muid};g' \
- -e 's;@l_mgrp@;%{l_mgrp};g' \
- -e 's;@l_mgid@;%{l_mgid};g' \
- -e 's;@l_nusr@;%{l_nusr};g' \
- -e 's;@l_nuid@;%{l_nuid};g' \
- -e 's;@l_ngrp@;%{l_ngrp};g' \
- -e 's;@l_ngid@;%{l_ngid};g' \
`find . -type f -print`
rm -rf */*.orig */.[a-z]*.orig >/dev/null 2>&1 || true
%{l_shtool} mkdir -f -p -m 755 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lyx/lyx.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 lyx.spec
--- openpkg-src/lyx/lyx.spec 10 Jul 2003 14:48:57 -0000 1.16
+++ openpkg-src/lyx/lyx.spec 21 Jul 2003 09:56:55 -0000 1.17
@@ -37,7 +37,7 @@
Group: Print
License: GPL
Version: %{V_lyx}
-Release: 20030710
+Release: 20030721
# package options
%option with_xforms no
@@ -88,8 +88,7 @@
x11_lib=`%{l_prefix}/etc/rc --query x11_libdir`
%if "%{with_xforms}" == "yes"
( cd xforms-%{V_xforms}
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
Imakefile */Imakefile
PATH=$x11_bin:$PATH
imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11_lib/X11/config
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monit/monit.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 monit.spec
--- openpkg-src/monit/monit.spec 21 Jul 2003 08:12:37 -0000 1.18
+++ openpkg-src/monit/monit.spec 21 Jul 2003 09:56:56 -0000 1.19
@@ -70,8 +70,7 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
files.c monit.1
%{l_shtool} subst \
-e 's;piddir=;dummy=;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 mysql.spec
--- openpkg-src/mysql/mysql.spec 21 Jul 2003 08:12:37 -0000 1.68
+++ openpkg-src/mysql/mysql.spec 21 Jul 2003 09:56:56 -0000 1.69
@@ -74,8 +74,7 @@
%build
# patch file search path
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
mysys/default.c
# determine additional configure options
@@ -115,8 +114,7 @@
rm -rf $RPM_BUILD_ROOT
# patch init script
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
scripts/mysql_install_db.sh
# perform standard installation procedure
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/mysql3.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 mysql3.spec
--- openpkg-src/mysql3/mysql3.spec 21 Jul 2003 08:12:38 -0000 1.14
+++ openpkg-src/mysql3/mysql3.spec 21 Jul 2003 09:56:57 -0000 1.15
@@ -82,8 +82,7 @@
%build
# patch file search path
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
mysys/default.c
# patch socklen_t for Sol6
@@ -147,8 +146,7 @@
rm -rf $RPM_BUILD_ROOT
# patch init script
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
scripts/mysql_install_db.sh
# perform standard installation procedure
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/powerdns.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 powerdns.spec
--- openpkg-src/powerdns/powerdns.spec 21 Jul 2003 08:40:43 -0000 1.26
+++ openpkg-src/powerdns/powerdns.spec 21 Jul 2003 09:56:57 -0000 1.27
@@ -140,8 +140,7 @@
# setup config file
mv $RPM_BUILD_ROOT%{l_prefix}/etc/powerdns/pdns.conf-dist \
$RPM_BUILD_ROOT%{l_prefix}/etc/powerdns/pdns.conf
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
$RPM_BUILD_ROOT%{l_prefix}/etc/powerdns/pdns.conf
# install run-command script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tripwire/tripwire.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 tripwire.spec
--- openpkg-src/tripwire/tripwire.spec 21 Jul 2003 08:40:56 -0000 1.19
+++ openpkg-src/tripwire/tripwire.spec 21 Jul 2003 09:56:58 -0000 1.20
@@ -104,8 +104,7 @@
%{l_shtool} subst \
-e 's;!(IS_SOLARIS && IS_IX86);0;' \
tripwire/smtpmailmessage.cpp
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} subst %{l_value -s -a} \
core/stdcore.h
%{l_shtool} subst \
-e 's;<malloc\.h>;<stdlib.h>;g' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/whoson/whoson.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 whoson.spec
--- openpkg-src/whoson/whoson.spec 21 Jul 2003 08:40:57 -0000 1.15
+++ openpkg-src/whoson/whoson.spec 21 Jul 2003 09:56:59 -0000 1.16
@@ -72,10 +72,7 @@
%patch -p0
%build
- %{l_shtool} subst \
- -e 's;@l_prefix@;%{l_prefix};g' \
- -e 's;@l_rusr@;%{l_rusr};g' \
- -e 's;@l_rgrp@;%{l_rgrp};g' \
+ %{l_shtool} subst %{l_value -s -a} \
whoson.conf
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5680 -r1.5681 news.txt
--- openpkg-web/news.txt 21 Jul 2003 09:35:15 -0000 1.5680
+++ openpkg-web/news.txt 21 Jul 2003 09:56:52 -0000 1.5681
@@ -1,3 +1,7 @@
+21-Jul-2003: Upgraded package: P<lyx-1.3.2-20030721>
+21-Jul-2003: Upgraded package: P<jitterbug-1.6.2.3-20030721>
+21-Jul-2003: Upgraded package: P<dss-4.1.3-20030721>
+21-Jul-2003: Upgraded package: P<djbdns-1.05-20030721>
21-Jul-2003: Upgraded package: P<mailgrep-0.5.0-20030721>
21-Jul-2003: New package: P<gxmame-0.33-20030721>
21-Jul-2003: Upgraded package: P<gdk-pixbuf-0.22.0-20030721>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
