projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spaceing ... more space for the title and more space the the left of the yaxis...
[rrdtool.git]
/
rrdtool.spec
diff --git
a/rrdtool.spec
b/rrdtool.spec
index
e1df5ba
..
e291587
100644
(file)
--- a/
rrdtool.spec
+++ b/
rrdtool.spec
@@
-1,19
+1,19
@@
-%define cvsdate
2004-04-30
+%define cvsdate
cvs-snap
%define cvsver %(echo %{cvsdate} | tr -d -)
%define cvsver %(echo %{cvsdate} | tr -d -)
-%define sover 1.0.
2
+%define sover 1.0.
0
Summary: Round Robin Database Tools
Name: rrdtool
Summary: Round Robin Database Tools
Name: rrdtool
-Version: 1.
1
.0
-Release:
0.1.
%{cvsver}
+Version: 1.
2
.0
+Release: %{cvsver}
License: GPL
License: GPL
-Group: Applications/
Networking
-Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/rrdtool-
cvs-snap
.tar.gz
+Group: Applications/
Databases
+Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/beta/rrdtool-
1.2rc1
.tar.gz
URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
Buildroot: /tmp/%{name}-root
BuildRequires: perl
URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
Buildroot: /tmp/%{name}-root
BuildRequires: perl
-BuildRequires: cgilib
+BuildRequires: cgilib
-devel
BuildRequires: freetype-devel libart_lgpl-devel libpng-devel zlib-devel
%description
BuildRequires: freetype-devel libart_lgpl-devel libpng-devel zlib-devel
%description
@@
-29,15
+29,15
@@
values collected over a definable time period.
%package devel
Summary: RRD Tool development libraries and header files
Group: Development/Libraries
%package devel
Summary: RRD Tool development libraries and header files
Group: Development/Libraries
-Requires:
rrdtool = %{version}-%{release
}
+Requires:
%{name} = %{version
}
%description devel
The RRD Tools development library.
%package perl
Summary: RRD Tool Perl interface
%description devel
The RRD Tools development library.
%package perl
Summary: RRD Tool Perl interface
-Group: Applications/
Networking
-Requires:
rrdtool = %{version}-%{release
}
+Group: Applications/
Databases
+Requires:
%{name} = %{version
}
%description perl
The RRD Tools Perl modules.
%description perl
The RRD Tools Perl modules.
@@
-45,13
+45,7
@@
The RRD Tools Perl modules.
%prep
%setup -q -n rrdtool-%{cvsdate}
%prep
%setup -q -n rrdtool-%{cvsdate}
-mkdir config
-cd config
-ln -s ../mkinstalldirs .
-cd ..
-
-%define deffont %{_datadir}/fonts/VeraMono.ttf
-perl -pi -e 's!^(#define\s+RRD_DEFAULT_FONT\s+).*!$1"%{deffont}"!' src/rrd_graph.c
+%define deffont %{_datadir}/%{name}/fonts/VeraMono.ttf
%build
CPPFLAGS="-I/usr/include/libart-2.0 -I/usr/include/freetype2"
%build
CPPFLAGS="-I/usr/include/libart-2.0 -I/usr/include/freetype2"
@@
-70,6
+64,7
@@
install -m 644 src/VeraMono.ttf %{buildroot}%{deffont}
# Fix up the documentation
[ -d docs ] && mv docs docs.src
mv %{buildroot}/usr/doc docs
# Fix up the documentation
[ -d docs ] && mv docs docs.src
mv %{buildroot}/usr/doc docs
+rm -f docs/*.pod
[ -d examples ] && mv examples examples.src
mv %{buildroot}/usr/examples examples
[ -d html ] && mv html html.src
[ -d examples ] && mv examples examples.src
mv %{buildroot}/usr/examples examples
[ -d html ] && mv html html.src
@@
-80,9
+75,10
@@
mv %{buildroot}/usr/html html
mkdir -p %{buildroot}%{perlsite}
mv %{buildroot}%{_libdir}/perl/* %{buildroot}%{perlsite}
rmdir %{buildroot}%{_libdir}/perl
mkdir -p %{buildroot}%{perlsite}
mv %{buildroot}%{_libdir}/perl/* %{buildroot}%{perlsite}
rmdir %{buildroot}%{_libdir}/perl
+rm -f %{buildroot}/%{perlsite}/auto/RRDs/RRDs.bs
# Fix up the man pages
# Fix up the man pages
-if [ "%{_mandir}" != "/usr/man" ]; then
+if [ "%{_mandir}" != "/usr/
share/
man" ]; then
mkdir -p %{buildroot}%{_mandir}
mv %{buildroot}/usr/man/* %{buildroot}%{_mandir}/
fi
mkdir -p %{buildroot}%{_mandir}
mv %{buildroot}/usr/man/* %{buildroot}%{_mandir}/
fi
@@
-98,9
+94,10
@@
rm -rf %{buildroot}
%files
%defattr (-, root, root)
%files
%defattr (-, root, root)
-%doc 00README CONTRIBUTORS COPYING COPYRIGHT ChangeLog NEWS PROJECTS
-%doc README THREADS TODO examples
-%doc docs examples html
+%doc 00README CONTRIBUTORS COPYING COPYRIGHT NEWS PROJECTS
+%doc README THREADS TODO
+%doc docs/[a-z]* html/[a-z]*
+%doc examples/*.cgi
%{_bindir}/rrdcgi
%{_bindir}/rrdtool
%{_bindir}/rrdupdate
%{_bindir}/rrdcgi
%{_bindir}/rrdtool
%{_bindir}/rrdupdate
@@
-120,15
+117,18
@@
rm -rf %{buildroot}
%{_libdir}/librrd_th.so
%files perl
%{_libdir}/librrd_th.so
%files perl
+%doc examples/*.pl
+%doc docs/RRD* html/RRD*
%defattr (-, root, root)
%{perlsite}/RRDp.pm
%{perlsite}/RRDs.pm
%dir %{perlsite}/auto/RRDs
%defattr (-, root, root)
%{perlsite}/RRDp.pm
%{perlsite}/RRDs.pm
%dir %{perlsite}/auto/RRDs
-%{perlsite}/auto/RRDs/RRDs.bs
%{perlsite}/auto/RRDs/RRDs.so
%{_mandir}/man1/RRDp.1*
%{_mandir}/man1/RRDs.1*
%changelog
%{perlsite}/auto/RRDs/RRDs.so
%{_mandir}/man1/RRDp.1*
%{_mandir}/man1/RRDs.1*
%changelog
+* Wed May 26 2004 Mike Slifcak <slif@bellsouth.net> 1.1.0-0.1.20040526
+- package examples with rrdtool-perl (decouple Perl from main package)
* Thu Apr 29 2004 Chris Adams <cmadams@hiwaay.net> 1.1.0-0.1.20040430
- initial build
* Thu Apr 29 2004 Chris Adams <cmadams@hiwaay.net> 1.1.0-0.1.20040430
- initial build