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: 27-Jan-2004 21:32:26
Branch: HEAD Handle: 2004012720322402
Modified files:
openpkg-src/spamassassin
spamassassin.spec
openpkg-web news.txt
Log:
switch to perl-openpkg and install into own libdir
Summary:
Revision Changes Path
1.32 +17 -20 openpkg-src/spamassassin/spamassassin.spec
1.8334 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 26 Jan 2004 15:16:03 -0000
1.31
+++ openpkg-src/spamassassin/spamassassin.spec 27 Jan 2004 20:32:26 -0000
1.32
@@ -33,7 +33,7 @@
Group: Mail
License: GPL/Artistic
Version: 2.63
-Release: 20040126
+Release: 20040127
# package options
%option with_fsl yes
@@ -47,8 +47,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030718, perl, perl-xml, make
-PreReq: OpenPKG, openpkg >= 20030718, perl, perl-xml
+BuildPreReq: OpenPKG, openpkg >= 20030718, perl, perl-openpkg >= 20040127,
perl-xml, make
+PreReq: OpenPKG, openpkg >= 20030718, perl, perl-openpkg >= 20040127, perl-xml
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.3.0
PreReq: fsl >= 1.3.0
@@ -75,16 +75,19 @@
%build
# build package
+ %{l_prefix}/bin/perl-openpkg prepare
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
- %{l_prefix}/bin/perl Makefile.PL </dev/null \
- DESTDIR="$RPM_BUILD_ROOT" \
- PREFIX="%{l_prefix}" \
- SYSCONFDIR="%{l_prefix}/etc/spamassassin" \
- LOCALRULESDIR="%{l_prefix}/etc/spamassassin" \
- DATADIR="%{l_prefix}/share/spamassassin"
+ %{l_prefix}/bin/perl-openpkg configure \
+ -l %{l_prefix}/lib/spamassassin \
+ -A DESTDIR="$RPM_BUILD_ROOT" \
+ -A PREFIX="%{l_prefix}" \
+ -A SYSCONFDIR="%{l_prefix}/etc/spamassassin" \
+ -A LOCALRULESDIR="%{l_prefix}/etc/spamassassin" \
+ -A DATADIR="%{l_prefix}/share/spamassassin" \
+ -A PERL_BIN="%{l_prefix}/bin/perl"
%install
rm -rf $RPM_BUILD_ROOT
@@ -120,22 +123,16 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
# determine installation files
- eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib
-V:installsitearch -V:installsitelib`
+ %{l_prefix}/bin/perl-openpkg \
+ -F perl-openpkg-files \
+ -l %{l_prefix}/lib/spamassassin \
+ fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.spamassassin' \
'%config %{l_prefix}/etc/spamassassin/*' \
- "%not %dir %{l_prefix}/lib/perl" \
- "%not %dir %{l_prefix}/lib/perl/*" \
- "%not %dir $installarchlib" \
- "%not %dir $installprivlib" \
- "%not %dir $installsitearch" \
- "%not %dir $installsitelib" \
- "%not %dir $installarchlib/auto" \
- "%not %dir $installprivlib/auto" \
- "%not %dir $installsitearch/auto" \
- "%not %dir $installsitelib/auto"
+ `cat perl-openpkg-files`
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8333 -r1.8334 news.txt
--- openpkg-web/news.txt 27 Jan 2004 19:17:54 -0000 1.8333
+++ openpkg-web/news.txt 27 Jan 2004 20:32:24 -0000 1.8334
@@ -1,3 +1,4 @@
+27-Jan-2004: Upgraded package: P<spamassassin-2.63-20040127>
27-Jan-2004: Upgraded package: P<vim-6.2.212-20040127>
27-Jan-2004: Upgraded package: P<xmlsec-1.2.4-20040127>
27-Jan-2004: Upgraded package: P<perl-apache-20040127-20040127>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
