spec file, specifically:
- Reset Release to 1
- Add -lua subpackage
- Fix -perl subpackage so it includes the correct Perl package paths
The version should probably be updated to 1.5.0 (for trunk), or we
could just grab that from configure.ac.
Tested building on EL5 and EL6 (beta).
It would be great if this could also be backported to the 1.4 tree.
-- Bernard Li <bernard@vanhpc.org>
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2230
a5681a0c-68f1-0310-ab6d-
d61299d08faa
%define with_php %{?_without_php: 0} %{?!_without_php: 1}
%define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
%define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
%define with_php %{?_without_php: 0} %{?!_without_php: 1}
%define with_tcl %{?_without_tcl: 0} %{?!_without_tcl: 1}
%define with_ruby %{?_without_ruby: 0} %{?!_without_ruby: 1}
+%define with_lua %{?_without_lua: 0} %{?!_without_lua: 1}
%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
%define svnrev r1190
#define pretag 1.2.99908020600
%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
%define svnrev r1190
#define pretag 1.2.99908020600
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
-Version: 1.4.3
-Release: 0.20%{?dist}
+Version: 1.4.999
+Release: 1%{?dist}
License: GPLv2+ with exceptions
Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/
License: GPLv2+ with exceptions
Group: Applications/Databases
URL: http://oss.oetiker.ch/rrdtool/
display time-series data (i.e. network bandwidth, machine-room temperature,
server load average). This package contains documentation on using RRD.
display time-series data (i.e. network bandwidth, machine-room temperature,
server load average). This package contains documentation on using RRD.
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+
%package perl
Summary: Perl RRDtool bindings
Group: Development/Languages
%package perl
Summary: Perl RRDtool bindings
Group: Development/Languages
The %{name}-ruby package includes RRDtool bindings for Ruby.
%endif
The %{name}-ruby package includes RRDtool bindings for Ruby.
%endif
+%if %{with_lua}
+%{!?lua_version: %define lua_version %(lua -v 2>&1 | cut -f2 -d' ' | cut -f1,2 -d '.')}
+
+%package lua
+Summary: Lua RRDtool bindings
+Group: Development/Languages
+BuildRequires: lua-devel
+Requires: lua
+Requires: %{name} = %{version}-%{release}
+
+%description lua
+The %{name}-lua package includes RRDtool bindings for Lua.
+%endif
+
%package cached
Summary: Data caching daemon for RRDtool
Group: Applications/Databases
%package cached
Summary: Data caching daemon for RRDtool
Group: Applications/Databases
%endif
%if %{with_ruby}
--enable-ruby \
%endif
%if %{with_ruby}
--enable-ruby \
+%else
+ --disable-ruby \
+%if %{with_lua}
+ --enable-lua \
+%else
+ --disable-lua \
+%endif
+ --enable-perl-site-install \
--disable-static \
--with-pic
--disable-static \
--with-pic
%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \
bindings/perl-shared/Makefile.PL
%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$rp||g' \
bindings/perl-shared/Makefile.PL
-# Force RRDp bits where we want 'em, not sure yet why the
-# --with-perl-options and --libdir don't take
-pushd bindings/perl-piped/
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi.orig -e 's|/lib/perl|/%{_lib}/perl|g' Makefile
-popd
-
#{__make} %{?_smp_mflags}
make
#{__make} %{?_smp_mflags}
make
-# Pesky RRDp.pm...
-%{__mv} $RPM_BUILD_ROOT%{perl_vendorarch}/../RRDp.pm $RPM_BUILD_ROOT%{perl_vendorarch}/
-
# Dunno why this is getting installed here...
%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/../leaktest.pl
# Dunno why this is getting installed here...
%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/../leaktest.pl
%{_mandir}/man3/*
%{perl_vendorarch}/*.pm
%attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
%{_mandir}/man3/*
%{perl_vendorarch}/*.pm
%attr(0755,root,root) %{perl_vendorarch}/auto/RRDs/
%if %{with_python}
%files python
%if %{with_python}
%files python
%{ruby_sitearch}/RRD.so
%endif
%{ruby_sitearch}/RRD.so
%endif
+%if %{with_lua}
+%files lua
+%defattr(-,root,root,-)
+%{_libdir}/lua/%{lua_version}/rrd.*
+%endif
+
%files cached
%{_bindir}/rrdcached
%config %{_sysconfdir}/default/*
%files cached
%{_bindir}/rrdcached
%config %{_sysconfdir}/default/*
%attr(0775 %rrdcached_user %rrdcached_user) %dir %{_localstatedir}/run/rrdcached
%changelog
%attr(0775 %rrdcached_user %rrdcached_user) %dir %{_localstatedir}/run/rrdcached
%changelog
+* Tue Jan 25 2011 Bernard Li <bernard@vanhpc.org>
+- Reset Release to 1
+- Add -lua subpackage
+- Fix -perl subpackage so it includes the correct Perl package paths
+
* Wed Oct 08 2008 Bernard Li <bernard@vanhpc.org>
- Split rrdcached related files to -cached subpackage
- Create rrdcached user and make rrdcached related files owned by it
* Wed Oct 08 2008 Bernard Li <bernard@vanhpc.org>
- Split rrdcached related files to -cached subpackage
- Create rrdcached user and make rrdcached related files owned by it