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: 01-Jul-2003 16:40:45
Branch: HEAD Handle: 2003070115404401
Added files:
openpkg-src/nntpcache fsl.nntpcache rc.nntpcache
Modified files:
openpkg-src/nntpcache nntpcache.spec
openpkg-web news.txt
Log:
add fsl support
Summary:
Revision Changes Path
1.1 +15 -0 openpkg-src/nntpcache/fsl.nntpcache
1.27 +40 -5 openpkg-src/nntpcache/nntpcache.spec
1.1 +23 -0 openpkg-src/nntpcache/rc.nntpcache
1.5124 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nntpcache/fsl.nntpcache
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.nntpcache
--- /dev/null 2003-07-01 16:40:45.000000000 +0200
+++ fsl.nntpcache 2003-07-01 16:40:45.000000000 +0200
@@ -0,0 +1,15 @@
+##
+## fsl.nntpcache -- OSSP fsl configuration
+##
+
+ident (nntpcache.*)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/nntpcache/nntpcache.log",
+ append=1, perm=0644
+ )
+ }
+};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nntpcache/nntpcache.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 nntpcache.spec
--- openpkg-src/nntpcache/nntpcache.spec 3 Jan 2003 10:53:35 -0000 1.26
+++ openpkg-src/nntpcache/nntpcache.spec 1 Jul 2003 14:40:45 -0000 1.27
@@ -33,16 +33,25 @@
Group: News
License: BSD
Version: 3.0.1
-Release: 20020405
+Release: 20030701
+
+# package options
+%option with_fsl yes
# list of sources
Source0: ftp://ftp.nntpcache.org/pub/nntpcache/nntpcache-%{version}.tar.gz
+Source1: rc.nntpcache
+Source2: fsl.nntpcache
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, make
-PreReq: OpenPKG, openpkg >= 20020206
+BuildPreReq: OpenPKG, openpkg >= 20030415, make
+PreReq: OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
AutoReq: no
AutoReqProv: no
@@ -64,6 +73,8 @@
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/nntpcache \
@@ -72,6 +83,8 @@
%install
rm -rf $RPM_BUILD_ROOT
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var
%{l_shtool} subst \
-e "s;chown;true;g" -e "s;chgrp;true;g" \
`find . -type f -name Makefile -print`
@@ -95,8 +108,30 @@
done
)
find $RPM_BUILD_ROOT%{l_prefix} -type d -print | xargs chmod 755
- find $RPM_BUILD_ROOT%{l_prefix} -type f -print | xargs chmod 644
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ find $RPM_BUILD_ROOT%{l_prefix} -type f -print | grep -v /sbin | xargs chmod 644
+
+ # Creating run-command script
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_susr@;%{l_susr};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -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
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.%{name}} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.%{name}'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nntpcache/rc.nntpcache
============================================================================
$ cvs diff -u -r0 -r1.1 rc.nntpcache
--- /dev/null 2003-07-01 16:40:45.000000000 +0200
+++ rc.nntpcache 2003-07-01 16:40:45.000000000 +0200
@@ -0,0 +1,23 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.nntpcache -- Run-Commands
+##
+
+%config
+ nntpcache_enable="yes"
+ nntpcache_log_prolog="true"
+ nntpcache_log_epilog="true"
+ nntpcache_log_numfiles="10"
+ nntpcache_log_minsize="1M"
+ nntpcache_log_complevel="9"
+
+%daily -u @l_susr@
+ opServiceEnabled nntpcache || exit 0
+
+ # rotate logfile
+ shtool rotate -f \
+ -n${nntpcache_log_numfiles} -s${nntpcache_log_minsize} -d \
+ -z${nntpcache_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${nntpcache_log_prolog}" \
+ -E "${nntpcache_log_epilog}" \
+ @l_prefix@/var/nntpcache/nntpcache.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5123 -r1.5124 news.txt
--- openpkg-web/news.txt 1 Jul 2003 14:40:31 -0000 1.5123
+++ openpkg-web/news.txt 1 Jul 2003 14:40:44 -0000 1.5124
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P<nntpcache-3.0.1-20030701>
01-Jul-2003: Upgraded package: P<kermit-8.0.209-20030701>
01-Jul-2003: Upgraded package: P<cadaver-0.21.0-20030701>
01-Jul-2003: Upgraded package: P<gcc32-3.2.3-20030701>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
