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: 02-Feb-2003 10:15:06
Branch: HEAD Handle: 2003020209150203
Modified files:
openpkg-src/mixmaster mixmaster.spec
openpkg-web news.txt
Log:
- fix Vendor: header
- reduce sub-shell usage to minimum required
- use %{l_cppflags} for include dirs (-I)
- use %{l_ldflags} for lib dirs (-L)
- override OPT and CC also via shtool subst to be consistent
across all Makefile variable overriding
- use "shtool install" with _multiple_ source files to avoid extra loop
- downgrade to JUNK until we have a reasonable default config
- add FIXME to remember the JUNK reason
Summary:
Revision Changes Path
1.2 +15 -20 openpkg-src/mixmaster/mixmaster.spec
1.3148 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mixmaster/mixmaster.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 mixmaster.spec
--- openpkg-src/mixmaster/mixmaster.spec 31 Jan 2003 16:12:43 -0000 1.1
+++ openpkg-src/mixmaster/mixmaster.spec 2 Feb 2003 09:15:05 -0000 1.2
@@ -23,17 +23,19 @@
## SUCH DAMAGE.
##
+# FIXME: rse: reasonable default configuration missing
+
# package information
Name: mixmaster
Summary: Anonymous Remailer
URL: http://www.mixmaster.org/
-Vendor: John Doe
+Vendor: Lance Cottrell & Ulf M�ller
Packager: The OpenPKG Project
-Distribution: OpenPKG [EVAL]
+Distribution: OpenPKG [JUNK]
Group: Mail
License: GPL
Version: 2.9.0
-Release: 20030131
+Release: 20030202
# list of sources
Source0: ftp://mixmaster.anonymizer.com/pub/source/mixmaster-%{version}.tar.gz
@@ -56,38 +58,31 @@
%setup -q
%build
- ( cd Src;
- cp Makefile.in Makefile
- %{l_shtool} subst \
- -e 's;\%INC;-I%{l_prefix}/include;' \
+ cd Src
+ cp Makefile.in Makefile
+ %{l_shtool} subst \
+ -e 's;\%INC;%{l_cppflags};' \
-e 's;\%DEF;-DUSE_ZLIB -DUSE_PCRE -DUSE_NCURSES -DHAVE_NCURSES_H;' \
+ -e 's;\%LDFLAGS;%{l_ldflags};' \
-e 's;\%LIBS;-lpcre -lz -lcrypto -lssl -lncurses;' \
- -e 's;\%LDFLAGS;-L%{l_prefix}/lib;' \
-e 's;\%MIXDIR;-DSPOOL=\\"%{l_prefix}/var/mixmaster\\";' \
+ -e 's;^\(CC =\).*;\1 %{l_cc};' \
+ -e 's;^\(OPT =\).*;\1 %{l_cflags -O};' \
Makefile
-
- %{l_make} %{l_mflags} \
- CC="%{l_cc}" \
- OPT="%{l_cflags -O}"
- )
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
-
%{l_shtool} mkdir -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
$RPM_BUILD_ROOT%{l_prefix}/libexec/mixmaster \
$RPM_BUILD_ROOT%{l_prefix}/var/mixmaster
%{l_shtool} install -c -s -m 755 \
Src/mix $RPM_BUILD_ROOT%{l_prefix}/libexec/mixmaster/
- # FIXME mlelstv - installing two template files
- for f in conf/*; do
- %{l_shtool} install -c -m 644 \
- $f $RPM_BUILD_ROOT%{l_prefix}/libexec/mixmaster/
- done
+ %{l_shtool} install -c -m 644 \
+ conf/* $RPM_BUILD_ROOT%{l_prefix}/libexec/mixmaster/
%{l_shtool} install -c -m 644 \
mix.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
-
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mixmaster'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3147 -r1.3148 news.txt
--- openpkg-web/news.txt 2 Feb 2003 08:51:46 -0000 1.3147
+++ openpkg-web/news.txt 2 Feb 2003 09:15:02 -0000 1.3148
@@ -1,3 +1,4 @@
+02-Feb-2003: Upgraded package: P<mixmaster-2.9.0-20030202>
02-Feb-2003: Upgraded package: P<vcg-1.30.3.17-20030202>
02-Feb-2003: Upgraded package: P<guile-1.6.3-20030202>
02-Feb-2003: Upgraded package: P<ncurses-5.3.20030201-20030202>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
