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: 04-Jul-2003 10:05:34
Branch: HEAD Handle: 2003070409053202
Modified files:
openpkg-src/rrdtool rrdtool.patch rrdtool.spec
openpkg-web news.txt
Log:
update to 1.0.43; reanimate and strip down patch; cleanup packaging;
fix manpage installation
Summary:
Revision Changes Path
1.2 +12 -21 openpkg-src/rrdtool/rrdtool.patch
1.39 +21 -9 openpkg-src/rrdtool/rrdtool.spec
1.5206 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 rrdtool.patch
--- openpkg-src/rrdtool/rrdtool.patch 12 Feb 2003 16:03:25 -0000 1.1
+++ openpkg-src/rrdtool/rrdtool.patch 4 Jul 2003 08:05:34 -0000 1.2
@@ -1,22 +1,13 @@
---- doc/Makefile.in.org Wed Feb 12 16:30:25 2003
-+++ doc/Makefile.in Wed Feb 12 16:31:26 2003
-@@ -95,7 +95,7 @@
+--- Makefile.in.orig Thu Jul 3 19:03:40 2003
++++ Makefile.in Fri Jul 4 09:39:53 2003
+@@ -398,8 +398,8 @@
+ $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
+ $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
+ $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs
$(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+- [ -f perl-shared/blib/arch/auto/RRDs/[EMAIL PROTECTED]@ ] && $(INSTALL) -m 755
perl-shared/blib/arch/auto/RRDs/[EMAIL PROTECTED]@
$(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+- [ -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle ] && $(INSTALL) -m 755
perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
++ [ -f perl-shared/blib/arch/auto/RRDs/[EMAIL PROTECTED]@ ] && $(INSTALL) -m 755
perl-shared/blib/arch/auto/RRDs/[EMAIL PROTECTED]@
$(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
++ [ -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle ] && $(INSTALL) -m 755
perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs ||
true
- CLEANFILES = *.1 *.html *.txt *-dircache *.pm *.pdf *~ core *itemcache *.rej *.orig
-
--POD = rrdtool.pod rrdlast.pod rrdcreate.pod rrdupdate.pod rrdtutorial.es.pod
cdeftutorial.pod rpntutorial.pod rrdgraph.pod bin_dec_hex.pod rrdfetch.pod
rrdrestore.pod rrddump.pod rrdtune.pod rrdresize.pod rrdcgi.pod rrdtutorial.pod
rrdinfo.pod rrdxport.pod
-+POD = rrdtool.pod rrdlast.pod rrdcreate.pod rrdupdate.pod cdeftutorial.pod
rpntutorial.pod rrdgraph.pod bin_dec_hex.pod rrdfetch.pod rrdrestore.pod
rrddump.pod rrdtune.pod rrdresize.pod rrdcgi.pod rrdtutorial.pod rrdinfo.pod
rrdxport.pod
-
-
- PMP = RRDs.pm RRDp.pm
---- doc/Makefile.am.org Wed Feb 12 16:30:44 2003
-+++ doc/Makefile.am Wed Feb 12 16:31:40 2003
-@@ -8,7 +8,7 @@
-
- CLEANFILES = *.1 *.html *.txt *-dircache *.pm *.pdf *~ core *itemcache *.rej *.orig
-
--POD = rrdtool.pod rrdlast.pod rrdcreate.pod rrdupdate.pod rrdtutorial.es.pod \
-+POD = rrdtool.pod rrdlast.pod rrdcreate.pod rrdupdate.pod \
- cdeftutorial.pod rpntutorial.pod rrdgraph.pod bin_dec_hex.pod \
- rrdfetch.pod rrdrestore.pod rrddump.pod rrdtune.pod rrdresize.pod \
- rrdcgi.pod rrdtutorial.pod rrdinfo.pod rrdxport.pod
+ perl_piped:: $(top_builddir)/perl-piped
+ test -d perl-piped \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rrdtool/rrdtool.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 rrdtool.spec
--- openpkg-src/rrdtool/rrdtool.spec 12 Apr 2003 18:03:04 -0000 1.38
+++ openpkg-src/rrdtool/rrdtool.spec 4 Jul 2003 08:05:34 -0000 1.39
@@ -32,12 +32,12 @@
Distribution: OpenPKG [BASE]
Group: Database
License: LGPL
-Version: 1.0.42
-Release: 20030412
+Version: 1.0.43
+Release: 20030704
# list of sources
Source0:
http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-%{version}.tar.gz
-Source1: rrdtool.patch
+Patch0: rrdtool.patch
# build information
Prefix: %{l_prefix}
@@ -59,35 +59,47 @@
%prep
%setup -q
- case "%{l_target}" in
- *-solaris2.6* )
- rm -f doc/*.es.*;
- %{l_patch} -p0 <%{SOURCE rrdtool.patch}
- ;;
- esac
+ %patch -p0
%build
+ # configure package
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
--disable-shared
+
+ # build package
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
+
+ # prepare for Perl module
%{l_prefix}/bin/perl-openpkg prolog
+
+ # adjust installation procedure for Perl module
eval `%{l_prefix}/bin/perl -V:installarchlib`
installarchlib=`echo $installarchlib | sed -e "s;^%{l_prefix};;"`
%{l_shtool} subst -e "s;/lib/perl;$installarchlib;g" Makefile
+
+ # perform installation procedure
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+
+ # 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}/examples
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+
+ # finalize Perl module installation
+ # (but keep the manual pages)
%{l_prefix}/bin/perl-openpkg epilog
+ ( grep -v /man files
+ echo "%{l_prefix}/man/man1/*.1"
+ ) >files.new && mv files.new files
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5205 -r1.5206 news.txt
--- openpkg-web/news.txt 4 Jul 2003 07:44:57 -0000 1.5205
+++ openpkg-web/news.txt 4 Jul 2003 08:05:32 -0000 1.5206
@@ -1,3 +1,4 @@
+04-Jul-2003: Upgraded package: P<rrdtool-1.0.43-20030704>
04-Jul-2003: Upgraded package: P<graphviz-1.10-20030704>
04-Jul-2003: Upgraded package: P<nessus-tool-2.0.7-20030704>
04-Jul-2003: Upgraded package: P<nessus-libs-2.0.7-20030704>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
