Browse Source

munin, rrdtool

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8710 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 9 years ago
parent
commit
54d6514737
3 changed files with 31 additions and 14 deletions
  1. 7 3
      m/munin/munin-vl.spec
  2. 6 1
      p/perl-FCGI/perl-FCGI-vl.spec
  3. 18 10
      r/rrdtool/rrdtool-vl.spec

+ 7 - 3
m/munin/munin-vl.spec

@@ -1,5 +1,5 @@
 Name:      munin
-Version:   2.0.17
+Version:   2.0.21
 Release:   1%{?_dist_release}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
@@ -46,8 +46,8 @@ BuildRequires:  perl(Net::Server)
 BuildRequires:  perl(Net::SSLeay)
 BuildRequires:  perl(Net::SNMP)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Test::MockModule)
-BuildRequires:  perl(Test::MockObject)
+#BuildRequires:  perl(Test::MockModule)
+#BuildRequires:  perl(Test::MockObject)
 #BuildRequires:  perl(Test::Perl::Critic) >= 1.096 ## Not packaged
 BuildRequires:  perl(Test::Pod::Coverage)
 BuildRequires:  perl(Time::HiRes)
@@ -518,6 +518,7 @@ exit 0
 %{_initdir}/munin-cgi-html
 %config(noreplace) %{_sysconfdir}/sysconfig/munin-cgi-graph
 %config(noreplace) %{_sysconfdir}/sysconfig/munin-cgi-html
+%config(noreplace) %{_sysconfdir}/sysconfig/spawn-fcgi-munin
 
 %files cgi-apache2
 %defattr(-,root,root)
@@ -529,6 +530,9 @@ exit 0
 
 
 %changelog
+* Tue Jul 1 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.21-1
+- new upstream release.
+
 * Sat Nov 23 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.17-1
 - new upstream release.
 - added sub packages "cgi-apache2" and "cgi-nginx".

+ 6 - 1
p/perl-FCGI/perl-FCGI-vl.spec

@@ -5,13 +5,15 @@
 Name:      perl-FCGI
 Summary:   FCGI - Perl module
 Version:   0.74
-Release:   1%{_dist_release}
+Release:   2%{_dist_release}
 License:   Artistic
 Group:     Development/Libraries
 Url:       http://www.cpan.org
 Buildroot: %{_tmppath}/%{name}-%{version}
 Source:    http://cpan.metacpan.org/authors/id/F/FL/FLORA/FCGI-%{version}.tar.gz
 
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
 %description
 This is a FastCGI module for perl.
 
@@ -104,6 +106,9 @@ find %{buildroot}%{_prefix}             \
 %defattr(-,root,root)
 
 %changelog
+* Tue Jul 1 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.74-2
+- rebuilt with perl-5.16.3.
+
 * Sat Nov 23 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.74-1
 - new upstream release.
 

+ 18 - 10
r/rrdtool/rrdtool-vl.spec

@@ -1,7 +1,7 @@
 
 # Basic Information
 Name:		rrdtool
-Version:	1.4.7
+Version:	1.4.8
 Release:	1%{?_dist_release}
 License:	GPLv2
 Group:		Applications/System
@@ -69,7 +69,12 @@ RDTool module for python
 %setup -q
 
 %build
-%configure --disable-ruby --enable-perl-site-install
+%configure \
+	--disable-ruby \
+	--enable-perl-site-install \
+	--with-perl-options="INSTALLDIRS=vendor"
+
+perl -pi -e 's/(rrdcached_LDADD =)/$1 \$(ALL_LIBS) /' src/Makefile
 %{__make} %{?_smp_mflags}
 
 %install
@@ -82,8 +87,8 @@ RDTool module for python
 %{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/librrd*.la
 %{__rm} -f ${RPM_BUILD_ROOT}%{_mandir}/man3/RRD?.3pm*
 %{__rm} -f ${RPM_BUILD_ROOT}%{perl_archlib}/perllocal.pod
-%{__rm} -f ${RPM_BUILD_ROOT}%{perl_sitearch}/auto/RRDp/.packlist
-%{__rm} -f ${RPM_BUILD_ROOT}%{perl_sitearch}/auto/RRDs/.packlist
+%{__rm} -f ${RPM_BUILD_ROOT}%{perl_vendorarch}/auto/RRDp/.packlist
+%{__rm} -f ${RPM_BUILD_ROOT}%{perl_vendorarch}/auto/RRDs/.packlist
 
 
 %clean
@@ -111,16 +116,16 @@ RDTool module for python
 
 %files tcl
 %defattr(-,root,root)
-%{_libdir}/rrdtool/ifOctets.tcl
-%{_libdir}/rrdtool/pkgIndex.tcl
+%{_datadir}/rrdtool/ifOctets.tcl
+%{_datadir}/rrdtool/pkgIndex.tcl
 %{_libdir}/tclrrd*.so
 
 %files -n perl-rrdtool
 %defattr(-,root,root)
-%{perl_sitelib}/RRDp.pm
-%{perl_sitearch}/RRDs.pm
-%{perl_sitearch}/auto/RRDs/RRDs.bs
-%{perl_sitearch}/auto/RRDs/RRDs.so
+%{perl_vendorlib}/RRDp.pm
+%{perl_vendorarch}/RRDs.pm
+%{perl_vendorarch}/auto/RRDs/RRDs.bs
+%{perl_vendorarch}/auto/RRDs/RRDs.so
 %{_datadir}/rrdtool/examples/*.pl
 %{_datadir}/rrdtool/examples/rrdcached/RRDCached.pm
 %{_datadir}/rrdtool/examples/rrdcached/rrdcached-size.pl
@@ -131,5 +136,8 @@ RDTool module for python
 %{python_sitearch}/rrdtoolmodule.so
 
 %changelog
+* Tue Jul  1 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-1
+- new upstream release.
+
 * Fri Feb 17 2012 Yasumichi Akahoshi <yasumichi@vinelinux.org> 1.4.7-1
 - initial build for Vine Linux