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: 04-Jul-2003 20:36:16
Branch: HEAD Handle: 2003070419361501
Modified files:
openpkg-src/nntpcache nntpcache.spec
openpkg-web news.txt
Log:
many cleanups, originally triggered by rpmlint issues
Summary:
Revision Changes Path
1.28 +26 -10 openpkg-src/nntpcache/nntpcache.spec
1.5267 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nntpcache/nntpcache.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 nntpcache.spec
--- openpkg-src/nntpcache/nntpcache.spec 1 Jul 2003 14:40:45 -0000 1.27
+++ openpkg-src/nntpcache/nntpcache.spec 4 Jul 2003 18:36:16 -0000 1.28
@@ -33,7 +33,7 @@
Group: News
License: BSD
Version: 3.0.1
-Release: 20030701
+Release: 20030704
# package options
%option with_fsl yes
@@ -68,9 +68,15 @@
%prep
%setup -q
- %{l_shtool} subst -e 's;test -e;test -f;g' Makefile* */Makefile*
%build
+ # configure package
+ %{l_shtool} subst \
+ -e 's;test -e;test -f;g' \
+ Makefile* */Makefile*
+ %{l_shtool} subst \
+ -e 's;/etc/nntpcache/\(newshound\.conf\);%{l_prefix}/etc/nntpcache/\1;' \
+ contrib/newshound/getconf.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
LDFLAGS="%{l_fsl_ldflags}" \
@@ -78,11 +84,16 @@
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/nntpcache \
+ --libexecdir=%{l_prefix}/libexec/nntpcache \
--localstatedir=%{l_prefix}/var/nntpcache
+
+ # build package
%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+
+ # install package
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var
%{l_shtool} subst \
@@ -92,25 +103,29 @@
prefix=$RPM_BUILD_ROOT%{l_prefix} \
exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache \
+ libexecdir=$RPM_BUILD_ROOT%{l_prefix}/libexecdir/nntpcache \
configDir=$RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache \
localstatedir=$RPM_BUILD_ROOT%{l_prefix}/var/nntpcache \
cacheDir=$RPM_BUILD_ROOT%{l_prefix}/var/nntpcache
+
+ # strip down and post-adjust installation hierarchy
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
rm -rf $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache/http
rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/sbin/innreport.sh
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/innreport.sh
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/newshound.pl
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache/pubring*
rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache/innreport*
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
+ find $RPM_BUILD_ROOT%{l_prefix} -type d -print | xargs chmod 755
+ find $RPM_BUILD_ROOT%{l_prefix} -type f -print | grep -v /sbin | xargs chmod 644
+ find $RPM_BUILD_ROOT%{l_prefix} -type f -name VERSION -print | xargs rm -f
( cd $RPM_BUILD_ROOT%{l_prefix}/etc/nntpcache
for file in *-dist; do
mv $file `echo $file | sed -e 's;-dist$;;'`
- done
- )
- find $RPM_BUILD_ROOT%{l_prefix} -type d -print | xargs chmod 755
- find $RPM_BUILD_ROOT%{l_prefix} -type f -print | grep -v /sbin | xargs chmod 644
+ done )
- # Creating run-command script
+ # install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 \
@@ -120,8 +135,9 @@
-e 's;@l_rgrp@;%{l_rgrp};g' \
%{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # OSSP fake syslog library
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
%{SOURCE fsl.%{name}} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5266 -r1.5267 news.txt
--- openpkg-web/news.txt 4 Jul 2003 18:34:05 -0000 1.5266
+++ openpkg-web/news.txt 4 Jul 2003 18:36:15 -0000 1.5267
@@ -1,3 +1,4 @@
+04-Jul-2003: Upgraded package: P<nntpcache-3.0.1-20030704>
04-Jul-2003: Upgraded package: P<wv-0.7.6-20030704>
04-Jul-2003: Upgraded package: P<gimp-1.2.5-20030704>
04-Jul-2003: Upgraded package: P<dss-4.1.3-20030704>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
