OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-May-2005 20:19:16
Branch: HEAD Handle: 2005050319191600
Modified files:
openpkg-src/rrdtool rrdtool.spec
Removed files:
openpkg-src/rrdtool rrdtool.patch
Log:
upgrading package: rrdtool 1.0.49 -> 1.2.1
Summary:
Revision Changes Path
1.9 +0 -56 openpkg-src/rrdtool/rrdtool.patch
1.60 +15 -12 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
rm -f openpkg-src/rrdtool/rrdtool.patch <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.59 -r1.60 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 24 Mar 2005 11:20:12 -0000 1.59
+++ openpkg-src/rrdtool/rrdtool.spec 3 May 2005 18:19:16 -0000 1.60
@@ -32,18 +32,19 @@
Class: BASE
Group: Database
License: LGPL
-Version: 1.0.49
-Release: 20041229
+Version: 1.2.1
+Release: 20050503
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
-Patch0: rrdtool.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-openpkg >=
5.8.3-20040126, gcc, png, zlib
-PreReq: OpenPKG, openpkg >= 20040130, perl, png, zlib
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, perl-openpkg >=
5.8.3-20040126
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: perl, png, zlib, libart, freetype
+PreReq: perl, png, zlib, libart, freetype
AutoReq: no
AutoReqProv: no
@@ -66,14 +67,16 @@
%prep
%setup -q
- %patch -p0
rm -f perl-shared/ntmake.pl
%build
# configure package
+ %{l_shtool} subst \
+ -e 's;lart_lgpl_2;lart_lgpl;g' \
+ configure
echo "ac_cv_path_PERL=no" >config.cache
CC="%{l_cc}" \
- CPPFLAGS="%{l_cppflags}" \
+ CPPFLAGS="%{l_cppflags libart .}" \
CFLAGS="%{l_cflags -O}" \
LDLAGS="%{l_ldflags}" \
./configure \
@@ -84,12 +87,12 @@
--enable-local-zlib
# build package
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
# 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
+ %{l_prefix}/bin/perl-openpkg -d bindings/perl-piped configure build
+ %{l_prefix}/bin/perl-openpkg -d bindings/perl-shared configure build
%install
rm -rf $RPM_BUILD_ROOT
@@ -102,8 +105,8 @@
DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
# install Perl part
- %{l_prefix}/bin/perl-openpkg -d perl-piped install
- %{l_prefix}/bin/perl-openpkg -d perl-shared install
+ %{l_prefix}/bin/perl-openpkg -d bindings/perl-piped install
+ %{l_prefix}/bin/perl-openpkg -d bindings/perl-shared install
# strip down installation hierarchy
rm -rf $RPM_BUILD_ROOT%{l_prefix}/contrib
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
