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: 02-Jun-2005 22:58:47
Branch: HEAD Handle: 2005060221584700
Modified files:
openpkg-src/rrdtool rrdtool.spec
Log:
resolve dependency problems inside BASE class by making PLUS-class
package cgilib an %option and also remove some extra files
Summary:
Revision Changes Path
1.65 +18 -8 openpkg-src/rrdtool/rrdtool.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 28 May 2005 18:44:11 -0000 1.64
+++ openpkg-src/rrdtool/rrdtool.spec 2 Jun 2005 20:58:47 -0000 1.65
@@ -33,7 +33,10 @@
Group: Database
License: LGPL
Version: 1.2.9
-Release: 20050528
+Release: 20050602
+
+# package options
+%option with_cgi no
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
@@ -43,8 +46,12 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, pkgconfig, perl-openpkg >=
5.8.3-20040126
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: perl, png, zlib, libart, freetype, cgilib
-PreReq: perl, png, zlib, libart, freetype, cgilib
+BuildPreReq: perl, png, zlib, libart, freetype
+PreReq: perl, png, zlib, libart, freetype
+%if "%{with_cgi}" == "yes"
+BuildPreReq: cgilib, pkgconfig
+PreReq: cgilib
+%endif
AutoReq: no
AutoReqProv: no
@@ -84,7 +91,12 @@
--prefix=%{l_prefix} \
--disable-shared \
--enable-local-libpng \
- --enable-local-zlib
+ --enable-local-zlib \
+%if "%{with_cgi}" == "yes"
+ --enable-rrdcgi
+%else
+ --disable-rrdcgi
+%endif
# build package
%{l_make} %{l_mflags}
@@ -109,11 +121,9 @@
%{l_prefix}/bin/perl-openpkg -d bindings/perl-shared install
# strip down installation hierarchy
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/contrib
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/html
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/shared/doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/examples
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/rrdtutorial.es.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/rrdtutorial.es.1
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
# post-process Perl part
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
