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: 28-Jan-2004 14:14:39
Branch: HEAD Handle: 2004012813143701
Modified files:
openpkg-src/rrdtool rrdtool.spec
openpkg-web news.txt
Log:
do not install Perl modules twice
Summary:
Revision Changes Path
1.46 +20 -6 openpkg-src/rrdtool/rrdtool.spec
1.8354 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 26 Jan 2004 13:09:45 -0000 1.45
+++ openpkg-src/rrdtool/rrdtool.spec 28 Jan 2004 13:14:38 -0000 1.46
@@ -33,7 +33,7 @@
Group: Database
License: LGPL
Version: 1.0.46
-Release: 20040126
+Release: 20040128
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
@@ -61,25 +61,35 @@
%build
# configure package
+ echo "ac_cv_path_PERL=no" >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--disable-shared
# build package
%{l_make} %{l_mflags -O}
+ # build Perl part
+ %{l_prefix}/bin/perl-openpkg prepare
+ %{l_prefix}/bin/perl-openpkg -d perl-piped configure build
+ %{l_prefix}/bin/perl-openpkg -d perl-shared configure build
+
%install
rm -rf $RPM_BUILD_ROOT
- # perform installation procedure
+ # install package
+ %{l_shtool} subst \
+ -e 's/^\(install-data-am:\).*/\1/' \
+ Makefile
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- %{l_prefix}/bin/perl-openpkg prepare
- %{l_prefix}/bin/perl-openpkg -d perl-piped configure build install
- %{l_prefix}/bin/perl-openpkg -d perl-shared configure build install
+ # install Perl part
+ %{l_prefix}/bin/perl-openpkg -d perl-piped install
+ %{l_prefix}/bin/perl-openpkg -d perl-shared install
# strip down installation hierarchy
rm -rf $RPM_BUILD_ROOT%{l_prefix}/contrib
@@ -88,8 +98,12 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/examples
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ # post-process Perl part
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat
perl-openpkg-files`
+
+ # determine installation files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} `cat perl-openpkg-files`
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8353 -r1.8354 news.txt
--- openpkg-web/news.txt 28 Jan 2004 10:43:11 -0000 1.8353
+++ openpkg-web/news.txt 28 Jan 2004 13:14:37 -0000 1.8354
@@ -1,3 +1,4 @@
+28-Jan-2004: Upgraded package: P<rrdtool-1.0.46-20040128>
28-Jan-2004: Upgraded package: P<ntp-4.2.0-20040128>
28-Jan-2004: Upgraded package: P<perl-kolab-20040128-20040128>
28-Jan-2004: Upgraded package: P<ripe-dbase-3.2.0-20040128>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
