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: 05-Mar-2003 19:51:56
Branch: HEAD Handle: 2003030518512629
Modified files:
openpkg-src/aica aica.spec
openpkg-src/apache apache.spec
openpkg-src/atool atool.spec
openpkg-src/epm epm.spec
openpkg-src/gtk2 gtk2.spec
openpkg-src/ispell ispell.spec
openpkg-src/libmikmod libmikmod.spec
openpkg-src/lyx lyx.spec
openpkg-src/magicpoint magicpoint.spec
openpkg-src/mirror mirror.spec
openpkg-src/opencdk opencdk.spec
openpkg-src/openldap openldap.spec
openpkg-src/openpkg openpkg.spec
openpkg-src/pam pam.spec
openpkg-src/perl-apache perl-apache.spec
openpkg-src/pnetlib pnetlib.spec
openpkg-src/poweradmin poweradmin.spec
openpkg-src/powerdns powerdns.spec
openpkg-src/rdist rdist.spec
openpkg-src/rt rt.spec
openpkg-src/sitecopy sitecopy.spec
openpkg-src/styx styx.spec
openpkg-src/teapop teapop.spec
openpkg-src/tetex tetex.spec
Log:
mega-commit: speclint police changes which were not picked up by
openpkg-dev before
Summary:
Revision Changes Path
1.6 +21 -27 openpkg-src/aica/aica.spec
1.125 +3 -3 openpkg-src/apache/apache.spec
1.22 +1 -2 openpkg-src/atool/atool.spec
1.21 +1 -2 openpkg-src/epm/epm.spec
1.2 +4 -4 openpkg-src/gtk2/gtk2.spec
1.31 +3 -3 openpkg-src/ispell/ispell.spec
1.3 +1 -1 openpkg-src/libmikmod/libmikmod.spec
1.2 +4 -3 openpkg-src/lyx/lyx.spec
1.25 +4 -5 openpkg-src/magicpoint/magicpoint.spec
1.26 +3 -3 openpkg-src/mirror/mirror.spec
1.5 +2 -2 openpkg-src/opencdk/opencdk.spec
1.52 +2 -2 openpkg-src/openldap/openldap.spec
1.139 +23 -25 openpkg-src/openpkg/openpkg.spec
1.11 +3 -3 openpkg-src/pam/pam.spec
1.9 +4 -4 openpkg-src/perl-apache/perl-apache.spec
1.2 +1 -3 openpkg-src/pnetlib/pnetlib.spec
1.2 +2 -2 openpkg-src/poweradmin/poweradmin.spec
1.4 +10 -10 openpkg-src/powerdns/powerdns.spec
1.2 +10 -10 openpkg-src/rdist/rdist.spec
1.30 +7 -7 openpkg-src/rt/rt.spec
1.27 +9 -10 openpkg-src/sitecopy/sitecopy.spec
1.8 +2 -2 openpkg-src/styx/styx.spec
1.12 +2 -2 openpkg-src/teapop/teapop.spec
1.43 +4 -4 openpkg-src/tetex/tetex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aica/aica.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 aica.spec
--- openpkg-src/aica/aica.spec 5 Mar 2003 16:55:52 -0000 1.5
+++ openpkg-src/aica/aica.spec 5 Mar 2003 18:51:26 -0000 1.6
@@ -33,7 +33,7 @@
Group: Security
License: AiCrypto
Version: 0.81
-Release: 20030205
+Release: 20030305
# list of sources
Source0: http://mars.elcom.nitech.ac.jp/security/AiCA-%{version}.tar.gz
@@ -64,23 +64,24 @@
-e 's;strncpy(buf,PREFIX;strncpy(buf,"%{l_prefix}/lib/aica";' \
aica/aica_conf.c
- # change path to config file
+ # change path to config file
for f in */Makefile.in; do
%{l_shtool} subst \
-e 's;/lib/aica.cnf;/etc/aica/aica.cnf;g' \
$f
done
- # change default path to certificates
+ # change default path to certificates
%{l_shtool} subst \
-e 's;"%s/certs",PREFIX;"%s/certs","%{l_prefix}/lib/aica";' \
aicrypto/ssl/ssl_vfy.c
- # mangle dangerous filenames that contain whitespace
+ # mangle dangerous filenames that contain whitespace
for f in templates/*; do
mv "$f" `echo "$f" | sed -e 's/ /_/g'`
done
- # patch source to reference mangled filenames
+
+ # patch source to reference mangled filenames
%{l_shtool} subst \
-e 's;"ARL Profile template";"ARL_Profile_template";g' \
-e 's;"CRL Profile template";"CRL_Profile_template";g' \
@@ -91,16 +92,21 @@
aica/aica_new.c \
ca/ca_asn1.c
+ # configure the sources
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix}
+
+ # build the program
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
+
+ # manually install components
%{l_shtool} mkdir -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/lib \
@@ -111,38 +117,26 @@
$RPM_BUILD_ROOT%{l_prefix}/var/aica \
$RPM_BUILD_ROOT%{l_prefix}/share/aica
%{l_shtool} install -c -s -m 755 \
- aica/aica \
- bin/aistore \
- bin/asn1view \
- bin/certconv \
- bin/certreq \
- bin/certvfy \
- bin/certview \
+ aica/aica bin/aistore bin/asn1view bin/certconv \
+ bin/certreq bin/certvfy bin/certview \
$RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 755 \
- bin/newca.sh \
- $RPM_BUILD_ROOT%{l_prefix}/bin/
+ bin/newca.sh $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
- lib/lib*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/
+ lib/lib*.a $RPM_BUILD_ROOT%{l_prefix}/lib/
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE aica.cnf} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/aica/
+ %{SOURCE aica.cnf} $RPM_BUILD_ROOT%{l_prefix}/etc/aica/
%{l_shtool} install -c -m 644 \
- aicrypto/include/* \
- aicrypto/aiconfig.h \
+ aicrypto/include/* aicrypto/aiconfig.h \
$RPM_BUILD_ROOT%{l_prefix}/include/aica/
%{l_shtool} install -c -m 644 \
- certs/* \
- $RPM_BUILD_ROOT%{l_prefix}/lib/aica/certs/
+ certs/* $RPM_BUILD_ROOT%{l_prefix}/lib/aica/certs/
%{l_shtool} install -c -m 644 \
- templates/* \
- $RPM_BUILD_ROOT%{l_prefix}/lib/aica/templates/
+ templates/* $RPM_BUILD_ROOT%{l_prefix}/lib/aica/templates/
%{l_shtool} install -c -m 644 \
- COPYRIGHT \
- README \
- $RPM_BUILD_ROOT%{l_prefix}/share/aica/
+ COPYRIGHT README $RPM_BUILD_ROOT%{l_prefix}/share/aica/
+
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/aica/aica.cnf'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.124 -r1.125 apache.spec
--- openpkg-src/apache/apache.spec 28 Feb 2003 14:28:14 -0000 1.124
+++ openpkg-src/apache/apache.spec 5 Mar 2003 18:51:28 -0000 1.125
@@ -1,5 +1,5 @@
##
-## apache.spec -- RPM Specification for Apache
+## apache.spec -- OpenPKG RPM Specification
## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20030228
+Release: 20030305
# package options (suexec related)
%option with_suexec yes
@@ -130,7 +130,7 @@
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
%if "%{with_mod_php3}" == "yes"
-ERROR: with_mod_php conflicts with with_mod_php3
+RPM ERROR: with_mod_php conflicts with with_mod_php3
%endif
%if "%{with_mod_ssl}" == "yes"
%undefine with_mod_php_openssl
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/atool/atool.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 atool.spec
--- openpkg-src/atool/atool.spec 3 Jan 2003 10:51:07 -0000 1.21
+++ openpkg-src/atool/atool.spec 5 Mar 2003 18:51:29 -0000 1.22
@@ -33,7 +33,7 @@
Group: Archiver
License: GPL
Version: 0.25.0
-Release: 20021109
+Release: 20030305
# list of sources
Source0: http://www.student.lu.se/~nbi98oli/src/atool-%{version}.tar.gz
@@ -58,7 +58,6 @@
%setup -q
%build
- # nop
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/epm/epm.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 epm.spec
--- openpkg-src/epm/epm.spec 29 Jan 2003 08:39:03 -0000 1.20
+++ openpkg-src/epm/epm.spec 5 Mar 2003 18:51:30 -0000 1.21
@@ -33,11 +33,10 @@
Group: System
License: GPL
Version: 3.5.1
-Release: 20021029
+Release: 20030305
# list of sources
Source0: ftp://ftp.easysw.com/pub/epm/epm-%{version}-source.tar.bz2
-
# build information
Prefix: %{l_prefix}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gtk2/gtk2.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 gtk2.spec
--- openpkg-src/gtk2/gtk2.spec 23 Feb 2003 09:42:37 -0000 1.1
+++ openpkg-src/gtk2/gtk2.spec 5 Mar 2003 18:51:32 -0000 1.2
@@ -23,9 +23,9 @@
## SUCH DAMAGE.
##
-# FIXME: | on "make install": cannot load module
-# FIXME: | /tmp/rse/openpkg/gtk+-2.2.1/modules/input/im-am-et.la:
-# FIXME: | /tmp/rse/openpkg/gtk+-2.2.1/modules/input/.libs/: inva
+# FIXME: rse: | on "make install": cannot load module
+# FIXME: rse: | /tmp/rse/openpkg/gtk+-2.2.1/modules/input/im-am-et.la:
+# FIXME: rse: | /tmp/rse/openpkg/gtk+-2.2.1/modules/input/.libs/: inva
# package version
%define V_gtk 2.2.1
@@ -44,7 +44,7 @@
Group: XWindow
License: GPL
Version: %{V_gtk}
-Release: 20030223
+Release: 20030305
# list of sources
Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ispell/ispell.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 ispell.spec
--- openpkg-src/ispell/ispell.spec 22 Feb 2003 08:49:52 -0000 1.30
+++ openpkg-src/ispell/ispell.spec 5 Mar 2003 18:51:33 -0000 1.31
@@ -33,7 +33,7 @@
Group: Text
License: BSD
Version: 3.2.06
-Release: 20030222
+Release: 20030305
# list of sources
Source0: http://fmg-www.cs.ucla.edu/geoff/tars/ispell-%{version}.tar.gz
@@ -80,7 +80,7 @@
case "%{l_target}" in
*-linux* | *-solaris* ) echo "#define USG" ;;
esac
- #echo "#define LANGUAGES
\"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
+ # echo "#define LANGUAGES
\"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
) >local.h
%{l_make} %{l_mflags}
( cd hk-deutsch
@@ -114,7 +114,7 @@
echo "#define MAN1DIR \"$RPM_BUILD_ROOT%{l_prefix}/man/man1\""
echo "#define MAN4DIR \"$RPM_BUILD_ROOT%{l_prefix}/man/man4\""
echo "#define WORDS \"$RPM_BUILD_DIR/words\""
- #echo "#define LANGUAGES
\"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
+ # echo "#define LANGUAGES
\"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
) >local.h
%{l_make} %{l_mflags} config.sh install-basic install-deformatters
install-dictbuild install-languages
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/ispell/american*
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libmikmod/libmikmod.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 libmikmod.spec
--- openpkg-src/libmikmod/libmikmod.spec 5 Mar 2003 17:06:13 -0000 1.2
+++ openpkg-src/libmikmod/libmikmod.spec 5 Mar 2003 18:51:34 -0000 1.3
@@ -33,7 +33,7 @@
Group: Audio
License: LGPL
Version: 3.1.10
-Release: 20030131
+Release: 20030305
# list of sources
Source0: http://www.mikmod.org/files/libmikmod/libmikmod-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lyx/lyx.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 lyx.spec
--- openpkg-src/lyx/lyx.spec 26 Feb 2003 12:28:57 -0000 1.1
+++ openpkg-src/lyx/lyx.spec 5 Mar 2003 18:51:35 -0000 1.2
@@ -23,8 +23,9 @@
## SUCH DAMAGE.
##
-# FIXME mlelstv - JUNK because Qt does not yet build
+# FIXME: mlelstv: JUNK because Qt does not yet build
+# package versions
%define V_lyx 1.3.0
%define V_xforms 1.0
@@ -38,7 +39,7 @@
Group: Print
License: GPL2
Version: %{V_lyx}
-Release: 20030226
+Release: 20030305
# list of sources
Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{V_lyx}.tar.gz
@@ -153,7 +154,7 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
%endif
- # preset known helper applications
+ # preset known helper applications
%{l_shtool} subst \
-e 's;^\(\\converter latex lyx \).*;\1 "reLyx -f $$i" "";' \
-e 's;^\(\\converter literate lyx \).*;\1 "noweb2lyx $$i $$o" "";' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/magicpoint/magicpoint.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 magicpoint.spec
--- openpkg-src/magicpoint/magicpoint.spec 15 Jan 2003 10:41:59 -0000 1.24
+++ openpkg-src/magicpoint/magicpoint.spec 5 Mar 2003 18:51:36 -0000 1.25
@@ -33,7 +33,7 @@
Group: Graphics
License: GPL
Version: 1.09a
-Release: 20030115
+Release: 20030305
# list of sources
Source0: ftp://ftp.mew.org/pub/mgp/magicpoint-%{version}.tar.gz
@@ -54,12 +54,12 @@
slides from a markup language based description.
%prep
- %setup -q
+ %setup0 -q
%setup1 -q -T -D -a 1
%patch0 -p0
%build
- # patch paths to data directory
+ # patch paths to data directory
%{l_shtool} subst \
-e 's;/usr/X11R6/lib/X11/mgp;%{l_prefix}/share/mgp;g' \
USAGE
@@ -121,9 +121,8 @@
contrib/xwintoppm/xwintoppm.man
$RPM_BUILD_ROOT%{l_prefix}/man/man1/xwintoppm.1
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
-
%files -f files
%clean
- # rm -rf $RPM_BUILD_ROOT
+ rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mirror/mirror.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 mirror.spec
--- openpkg-src/mirror/mirror.spec 3 Jan 2003 10:53:21 -0000 1.25
+++ openpkg-src/mirror/mirror.spec 5 Mar 2003 18:51:37 -0000 1.26
@@ -1,5 +1,5 @@
##
-## mirror.spec -- Portable RPM Specification
+## mirror.spec -- OpenPKG RPM Specification
## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
@@ -33,7 +33,7 @@
Group: FTP
License: BSD
Version: 2.9
-Release: 20020529
+Release: 20030305
# list of sources
Source0: ftp://sunsite.org.uk/packages/mirror/mirror-%{version}.tar.gz
@@ -61,7 +61,7 @@
%build
for prog in mirror.pl mm.pl do_unlinks.pl; do
- ( echo '#!%{l_prefix}/bin/perl -s'
+ ( echo '#!%{l_prefix}/bin/perl -s'
echo 'BEGIN {'
echo 'unshift(@INC, "%{l_prefix}/libexec/mirror");'
echo 'unshift(@INC, "%{l_prefix}/etc/mirror");'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/opencdk/opencdk.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 opencdk.spec
--- openpkg-src/opencdk/opencdk.spec 13 Feb 2003 10:03:31 -0000 1.4
+++ openpkg-src/opencdk/opencdk.spec 5 Mar 2003 18:51:39 -0000 1.5
@@ -9,7 +9,7 @@
## the above copyright notice and this permission notice appear in all
## copies.
##
-## THIS SOFTWARE IS PROVIDED AS IS'' AND ANY EXPRESSED OR IMPLIED
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 0.4.5
-Release: 20030213
+Release: 20030305
# list of sources
Source0: ftp://gnutls.hellug.gr/pub/gnutls/opencdk/opencdk-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.51 -r1.52 openldap.spec
--- openpkg-src/openldap/openldap.spec 1 Mar 2003 15:51:54 -0000 1.51
+++ openpkg-src/openldap/openldap.spec 5 Mar 2003 18:51:40 -0000 1.52
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.1.14
-Release: 20030301
+Release: 20030305
# list of sources
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
@@ -58,7 +58,7 @@
%setup -q
%build
- # hardware configure to use sasl2 library
+ # hard-code configure to use SASL2 library
%{l_shtool} subst \
-e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
configure
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.138 -r1.139 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Mar 2003 18:13:00 -0000 1.138
+++ openpkg-src/openpkg/openpkg.spec 5 Mar 2003 18:51:41 -0000 1.139
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20030301
-%define R_openpkg 20030301
+%define V_openpkg 20030305
+%define R_openpkg 20030305
# the used software versions
%define V_rpm 4.0.2
@@ -847,7 +847,7 @@
%pre
# always performed for upgrades and because it doesn't harm!
- #[ ".$1" != .1 ] && exit 0
+ # [ ".$1" != .1 ] && exit 0
# this procedure is only usable with root privileges
# (for non-root installations it is not required at all)
@@ -939,11 +939,11 @@
"management:${musr}:${muid}:${mgrp}:${mgid}" \
"restricted:${rusr}:${ruid}:${rgrp}:${rgid}" \
"non-privileged:${nusr}:${nuid}:${ngrp}:${ngid}"; do
- # split request into class/usr/uid/grp/gid
+ # split request into class/usr/uid/grp/gid
OIFS="$IFS"; IFS=":"; set -- $req; IFS="$OIFS"
class="$1"; usr="$2"; uid="$3"; grp="$4"; gid="$5"
- # check whether user already exists
+ # check whether user already exists
exists=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep
"^$usr:"`
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
@@ -986,7 +986,7 @@
fi
fi
- # check whether group already exists
+ # check whether group already exists
exists=`(getent group; cat /etc/group; ypcat group) 2>/dev/null | grep
"^$grp:"`
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
@@ -1071,8 +1071,8 @@
fi
;;
Linux/* )
- # sroot: script root directory
- # lroot: link root directory
+ # sroot: script root directory
+ # lroot: link root directory
if [ -f /etc/debian_version ]; then
sroot=/etc/init.d
lroot=/etc/rc%d.d
@@ -1258,18 +1258,16 @@
rm -rf %{l_prefix}/RPM/PKG/* >/dev/null 2>&1 || true
rm -rf %{l_prefix}/RPM/DB/* >/dev/null 2>&1 || true
- ##
- ## The following code usually would be done in a %postun section.
- ## But because we already had to remove the database in this %preun
- ## section (see the 'rm' commands above) in order to make RPM happy
- ## inside its own removal procedure, RPM would no longer find the
- ## %postun script (because it's recorded in the database files). So
- ## we have to perform the procedure already in this %preun script.
- ## except for the removal of the top-level directory it does not
- ## matter. But the top-level directory can only be removed after
- ## the RPM removal procedure took place, so we play a little delay
- ## trick below.
- ##
+ # The following code usually would be done in a %postun section.
+ # But because we already had to remove the database in this %preun
+ # section (see the 'rm' commands above) in order to make RPM happy
+ # inside its own removal procedure, RPM would no longer find the
+ # %postun script (because it's recorded in the database files). So
+ # we have to perform the procedure already in this %preun script.
+ # except for the removal of the top-level directory it does not
+ # matter. But the top-level directory can only be removed after
+ # the RPM removal procedure took place, so we play a little delay
+ # trick below.
# determine current user
cusr=`(id -un) 2>/dev/null ||\
@@ -1307,11 +1305,11 @@
"management:%{l_musr}:%{l_muid}:%{l_mgrp}:%{l_mgid}" \
"restricted:%{l_rusr}:%{l_ruid}:%{l_rgrp}:%{l_rgid}" \
"non-privileged:%{l_nusr}:%{l_nuid}:%{l_ngrp}:%{l_ngid}"; do
- # split request into class/usr/uid/grp/gid
+ # split request into class/usr/uid/grp/gid
OIFS="$IFS"; IFS=":"; set -- $req; IFS="$OIFS"
class="$1"; usr="$2"; uid="$3"; grp="$4"; gid="$5"
- # check whether user already exists
+ # check whether user already exists
exists=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null | grep
"^$usr:"`
if [ ".$exists" != . ]; then
if [ ".$cusr" != ".root" ]; then
@@ -1345,7 +1343,7 @@
fi
fi
- # check whether group already exists
+ # check whether group already exists
exists=`(getent group; cat /etc/group; ypcat group) 2>/dev/null | grep
"^$grp:"`
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
@@ -1376,8 +1374,8 @@
rm -f /etc/rc.d/${name} >/dev/null 2>&1
;;
Linux/* )
- # sroot: script root directory
- # lroot: link root directory
+ # sroot: script root directory
+ # lroot: link root directory
if [ -f /etc/debian_version ]; then
sroot=/etc/init.d
lroot=/etc/rc%d.d
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pam/pam.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 pam.spec
--- openpkg-src/pam/pam.spec 8 Jan 2003 13:11:24 -0000 1.10
+++ openpkg-src/pam/pam.spec 5 Mar 2003 18:51:42 -0000 1.11
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: Meta
License: PD
-Version: 20030108
-Release: 20030108
+Version: 20030305
+Release: 20030305
# list of sources
Source0: pamtool
@@ -63,7 +63,7 @@
pam_incdir=""
pam_libdir=""
- # search for configuration location
+ # search for configuration location
for cfgloc in \
/etc/pam.d \
/etc/pam.conf \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-apache/perl-apache.spec
============================================================================
$ cvs diff -u -r1.8 -r1.9 perl-apache.spec
--- openpkg-src/perl-apache/perl-apache.spec 26 Feb 2003 08:16:19 -0000 1.8
+++ openpkg-src/perl-apache/perl-apache.spec 5 Mar 2003 18:51:43 -0000 1.9
@@ -47,12 +47,12 @@
Distribution: OpenPKG [EVAL]
Group: Language
License: GPL/Artistic
-Version: 20030226
-Release: 20030226
+Version: 20030305
+Release: 20030305
# package options
-# FIMXE: alternative *brain-dead* behavior in Apache-AuthCookie's login
-# sub-routine. This options is only provided as a temporary fix!
+# FIMXE: rse: alternative *brain-dead* behavior in Apache-AuthCookie's login
+# FIXME: rse: sub-routine. This options is only provided as a temporary fix!
%option with_authcookie_alt no
# list of sources
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pnetlib/pnetlib.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 pnetlib.spec
--- openpkg-src/pnetlib/pnetlib.spec 8 Feb 2003 11:55:40 -0000 1.1
+++ openpkg-src/pnetlib/pnetlib.spec 5 Mar 2003 18:51:45 -0000 1.2
@@ -33,7 +33,7 @@
Group: Language
License: GPL
Version: 0.5.2
-Release: 20030208
+Release: 20030305
# list of sources
Source0: http://www.southern-storm.com.au/download/pnetlib-%{version}.tar.gz
@@ -65,8 +65,6 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- #rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
- #strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/poweradmin/poweradmin.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 poweradmin.spec
--- openpkg-src/poweradmin/poweradmin.spec 27 Feb 2003 16:23:24 -0000 1.1
+++ openpkg-src/poweradmin/poweradmin.spec 5 Mar 2003 18:51:46 -0000 1.2
@@ -23,7 +23,7 @@
## SUCH DAMAGE.
##
-# FIXME mlelstv - JUNK because no apache config
+# FIXME: mlelstv: JUNK because no apache config
# package information
Name: poweradmin
@@ -35,7 +35,7 @@
Group: Network
License: QPL
Version: 1.2.4
-Release: 20030227
+Release: 20030305
# list of sources
Source0:
http://osdn.dl.sourceforge.net/poweradmin/poweradmin-%{version}.tar.bz2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/powerdns.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 powerdns.spec
--- openpkg-src/powerdns/powerdns.spec 4 Mar 2003 16:25:46 -0000 1.3
+++ openpkg-src/powerdns/powerdns.spec 5 Mar 2003 18:51:47 -0000 1.4
@@ -23,7 +23,7 @@
## SUCH DAMAGE.
##
-# FIXME mlelstv - JUNK because not well tested and no config
+# FIXME: mlelstv: JUNK because not well tested and no config
# package information
Name: powerdns
@@ -35,7 +35,7 @@
Group: unknown
License: GPL
Version: 2.9.6
-Release: 20030304
+Release: 20030305
# list of sources
Source0: http://downloads.powerdns.com/releases/pdns-%{version}.tar.gz
@@ -70,15 +70,15 @@
%description
The PowerDNS name server is a modern, advanced and high performance
- authoritative-only nameserver. It is written from scratch and conforms
- to all the relevant DNS standards documents.
- The PowerDNS name server utilizes a flexible backend architecture which
- can access DNS information from any data source. This includes file
+ authoritative-only nameserver. It is written from scratch and
+ conforms to all the relevant DNS standards documents. The PowerDNS
+ name server utilizes a flexible backend architecture which can
+ access DNS information from any data source. This includes file
formats, Bind zone files, relational databases or LDAP directories.
- By connecting directly to a database, no 'reloading' is needed. Changes
- committed to the database are effective immediately.
- If you have specific needs for your DNS infrastructure then you can use
- the Backend Developers Kit to write the 'glue' between PowerDNS and your
+ By connecting directly to a database, no 'reloading' is needed.
+ Changes committed to the database are effective immediately. If you
+ have specific needs for your DNS infrastructure then you can use the
+ Backend Developers Kit to write the 'glue' between PowerDNS and your
data or logic.
%prep
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rdist.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 rdist.spec
--- openpkg-src/rdist/rdist.spec 24 Feb 2003 10:41:54 -0000 1.1
+++ openpkg-src/rdist/rdist.spec 5 Mar 2003 18:51:49 -0000 1.2
@@ -23,9 +23,12 @@
## SUCH DAMAGE.
##
+# FIXME: rse: does not compile under FreeBSD 4!
+
# package versions
%define V_base 7.0.0
%define V_pl alpha10
+%define V_opkg 7.0.0a10
# package information
Name: rdist
@@ -36,8 +39,8 @@
Distribution: OpenPKG [EVAL]
Group: Filesystem
License: BSD
-Version: %{V_base}
-Release: 20030224
+Version: %{V_opkg}
+Release: 20030305
# list of sources
Source0: http://www.magnicomp.com/download/rdist/rdist-%{V_base}-%{V_pl}.tar.gz
@@ -51,13 +54,10 @@
AutoReqProv: no
%description
- RDist is an open source program to maintain identical copies of files
- over multiple hosts. It preserves the owner, group, mode, and mtime of
- files if possible and can update programs that are executing.
-
- Almost all versions of UNIX include RDist. However, most that do include a
- very old version sometimes referred to as "4.2BSD rdist", "rdist classic",
- or "rdist version 3".
+ RDist is an open source program to maintain identical copies of
+ files over multiple hosts. It preserves the owner, group, mode,
+ and mtime of files if possible and can update programs that are
+ executing.
%prep
%setup -q -n %{name}-%{V_base}-%{V_pl}
@@ -67,7 +67,7 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix}
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rt.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 rt.spec
--- openpkg-src/rt/rt.spec 4 Mar 2003 11:23:22 -0000 1.29
+++ openpkg-src/rt/rt.spec 5 Mar 2003 18:51:50 -0000 1.30
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_here}
-Release: 20030304
+Release: 20030305
# list of sources
Source0:
http://www.cpan.org/modules/by-module/Log/Log-Dispatch-%{V_log_dispatch}.tar.gz
@@ -216,7 +216,7 @@
done
) || exit $?
- # setup/cleanup/upgrade script
+ # setup/cleanup/upgrade script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/sbin
%{l_shtool} install -c -m 755 \
@@ -235,7 +235,7 @@
%{SOURCE rtupgrade} \
$RPM_BUILD_ROOT%{l_prefix}/sbin/
- # startup script
+ # startup script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 \
@@ -245,7 +245,7 @@
%{SOURCE rc.rt} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # apachectl wrapper
+ # apachectl wrapper
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/rt/tools
%{l_shtool} install -c -m 755 \
@@ -253,7 +253,7 @@
%{SOURCE rtapachectl} \
$RPM_BUILD_ROOT%{l_prefix}/libexec/rt/tools/
- # apache config
+ # apache config
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_rusr@;%{l_rusr};g' \
@@ -261,13 +261,13 @@
%{SOURCE rtapache.conf} \
$RPM_BUILD_ROOT%{l_prefix}/libexec/rt/
- # apache data
+ # apache data
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/rt/run
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/rt/log
- # better places
+ # better places
mv $RPM_BUILD_ROOT%{l_prefix}/etc/rt/insertdata \
$RPM_BUILD_ROOT%{l_prefix}/libexec/rt/tools/
mv $RPM_BUILD_ROOT%{l_prefix}/bin/rt-mailgate \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sitecopy/sitecopy.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 sitecopy.spec
--- openpkg-src/sitecopy/sitecopy.spec 20 Feb 2003 09:28:01 -0000 1.26
+++ openpkg-src/sitecopy/sitecopy.spec 5 Mar 2003 18:51:51 -0000 1.27
@@ -33,7 +33,7 @@
Group: Web
License: GPL
Version: 0.12.1
-Release: 20030220
+Release: 20030305
# list of sources
Source0: http://www.lyra.org/sitecopy/sitecopy-%{version}.tar.gz
@@ -53,29 +53,28 @@
%setup -q
%build
- # fix broken archive
+ # fix broken archive
%{l_shtool} subst \
- -e 's;@PACKAGE@;@PACKAGE_NAME@;' \
- -e 's;@VERSION@;@PACKAGE_VERSION@;' \
- -e 's; FAQ ; ;' \
- Makefile.in
- # avoid picking up installed library
+ -e 's;@PACKAGE@;@PACKAGE_NAME@;' \
+ -e 's;@VERSION@;@PACKAGE_VERSION@;' \
+ -e 's; FAQ ; ;' \
+ Makefile.in
+ # avoid picking up installed library
%{l_shtool} subst -e 's;-lneon;\$neon_bundled_builddir/libneon.a;' configure
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/libxml2" \
+ CPPFLAGS="%{l_cppflags} -I%{l_prefix}/include/libxml2" \
LDFLAGS="%{l_ldflags} -L%{l_prefix}/lib" \
./configure \
--prefix=%{l_prefix} \
--with-ssl=%{l_prefix} \
- --with-included-neon \
+ --with-included-neon \
--with-libxml2 \
--without-gnome \
--disable-rsh \
--disable-nls
%{l_shtool} subst -e 's;lib/getopt1;lib/getopt1.o lib/getopt;' Makefile
%{l_make} %{l_mflags -O}
-
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/styx/styx.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 styx.spec
--- openpkg-src/styx/styx.spec 31 Jan 2003 12:26:20 -0000 1.7
+++ openpkg-src/styx/styx.spec 5 Mar 2003 18:51:52 -0000 1.8
@@ -33,7 +33,7 @@
Group: Compiler
License: GPL
Version: 1.5
-Release: 20020717
+Release: 20030305
# list of sources
Source0: http://www.speculate.de/styx/styx-%{version}.tgz
@@ -61,7 +61,7 @@
%setup -q
%patch -p0
find . -name "*.[ch]" -print |\
- xargs %{l_shtool} subst -e 's;<malloc.h>;<stdlib.h>;'
+ xargs %{l_shtool} subst -e 's;<malloc.h>;<stdlib.h>;'
rm -f config.cache
%build
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/teapop/teapop.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 teapop.spec
--- openpkg-src/teapop/teapop.spec 14 Jan 2003 15:46:33 -0000 1.11
+++ openpkg-src/teapop/teapop.spec 5 Mar 2003 18:51:54 -0000 1.12
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 0.3.5
-Release: 20030114
+Release: 20030305
# list of sources
Source0: http://www.toontown.org/pub/teapop/teapop-%{version}.tar.gz
@@ -72,7 +72,7 @@
teapop/teapop.c
%build
- # Building Teapop with OSSP fsl
+ # Building Teapop with OSSP fsl
CC="%{l_cc}" \
CFLAGS="%{l_cflags} `%{l_prefix}/bin/fsl-config --all --cflags`" \
CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/fsl-config --all --cflags`" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tetex/tetex.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 tetex.spec
--- openpkg-src/tetex/tetex.spec 1 Mar 2003 09:03:11 -0000 1.42
+++ openpkg-src/tetex/tetex.spec 5 Mar 2003 18:51:55 -0000 1.43
@@ -1,5 +1,5 @@
##
-## tetex.spec -- Portable RPM Specification
+## tetex.spec -- OpenPKG RPM Specification
## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
@@ -38,7 +38,7 @@
Group: Text
License: GPL
Version: %{V_src}
-Release: 20030301
+Release: 20030305
# package options
%option with_x11 no
@@ -175,13 +175,13 @@
# build the sources
# (we cannot use %{l_make}, because teTeX dislikes absolute
- # paths for make. Instead we work-around via $PATH)
+ # paths for make. Instead we work-around via $PATH)
make %{l_mflags} all
%install
# perform the standard installation procdure of teTeX
# (we cannot use %{l_make}, because teTeX dislikes absolute
- # paths for make. Instead we work-around via $PATH)
+ # paths for make. Instead we work-around via $PATH)
make %{l_mflags} install
# perform manual steps for installing XMLTeX
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
