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: 27-Sep-2003 22:54:58
Branch: HEAD Handle: 2003092721545800
Modified files:
openpkg-src/spamassassin
spamassassin.spec
Log:
try to fix the whole installation again
Summary:
Revision Changes Path
1.24 +21 -14 openpkg-src/spamassassin/spamassassin.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 27 Sep 2003 20:32:31 -0000
1.23
+++ openpkg-src/spamassassin/spamassassin.spec 27 Sep 2003 20:54:58 -0000
1.24
@@ -47,7 +47,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030718, perl, perl-xml, perl-openpkg, make
+BuildPreReq: OpenPKG, openpkg >= 20030718, perl, perl-xml, make
PreReq: OpenPKG, openpkg >= 20030718, perl, perl-xml
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
@@ -74,27 +74,23 @@
%endif
%build
-
-%install
- rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/var/spamassassin
-
- # build & install spamassassin
- eval `%{l_prefix}/bin/perl -V:sitelib`
- %{l_prefix}/bin/perl-openpkg prolog
+ # build package
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
- %{l_prefix}/bin/perl-openpkg install \
+ %{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" \
- LIB="$sitelib"
+ DATADIR="%{l_prefix}/share/spamassassin"
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ # install package
%{l_make} %{l_mflags} install
- %{l_prefix}/bin/perl-openpkg epilog
# install default configuration
%{l_shtool} mkdir -f -p -m 755 \
@@ -124,11 +120,22 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
# determine installation files
+ eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib
-V:installsitearch -V:installsitelib`
%{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/*'
+ '%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"
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
