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: 28-Jul-2003 16:02:57
Branch: HEAD Handle: 2003072815025600
Modified files:
openpkg-src/nntpcache nntpcache.spec
Log:
remove debug stuff at all
Summary:
Revision Changes Path
1.38 +12 -9 openpkg-src/nntpcache/nntpcache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nntpcache/nntpcache.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 nntpcache.spec
--- openpkg-src/nntpcache/nntpcache.spec 28 Jul 2003 13:45:04 -0000 1.37
+++ openpkg-src/nntpcache/nntpcache.spec 28 Jul 2003 14:02:56 -0000 1.38
@@ -23,8 +23,6 @@
## SUCH DAMAGE.
##
-# FIXME: send-mail -i [EMAIL PROTECTED]; tracked down to nntpcache-gdb.sh
-
# package information
Name: nntpcache
Summary: NNTP Caching Proxy
@@ -72,14 +70,14 @@
%prep
%setup -q
%patch -p0
+
+%build
+ # configure package
%if "%{with_fsl}" == "yes"
%{l_shtool} subst \
-e 's;\(openlog.*\)LOG_NEWS\(.*\);\1LOG_USER\2;' \
src/nntpcache.c
%endif
-
-%build
- # configure package
%{l_shtool} subst \
-e 's;test -e;test -f;g' \
Makefile* */Makefile*
@@ -91,9 +89,10 @@
-e 's;^\(adminEmail \).*;\1 [EMAIL PROTECTED];' \
-e 's;^/usr/local/\(etc|var.*\);%{l_prefix}/\1;' \
cf/nntpcache.config-dist
-
- (
- echo "nc_cv_UID=%{l_musr}"
+ %{l_shtool} subst -s \
+ -e 's;$libexecDir/nntpcache-gdb\.sh;true;' \
+ configure
+ ( echo "nc_cv_UID=%{l_musr}"
echo "nc_cv_GID=%{l_rgrp}"
) >config.cache
CC="%{l_cc}" \
@@ -123,7 +122,7 @@
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 \
+ libexecdir=$RPM_BUILD_ROOT%{l_prefix}/libexec/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
@@ -136,6 +135,9 @@
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*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/nntpcache/nntpcache-gdb.sh
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/nntpcache/nntpcache.gdb
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/nntpcache/nntpcached.debug
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
@@ -162,6 +164,7 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%config %{l_prefix}/etc/nntpcache/*' \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.nntpcache'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
