Changes - j0ke.net Open Build Service

Changes of Revision 26

[-] [+]	Changed	collectd.spec
@@ -1,7 +1,7 @@ # norootforbuild Name: collectd -Version: 4.5.2 +Version: 4.6.1 Release: 1 Summary: Statistics Collection Daemon for filling RRD Files Source: http://verplant.org/collectd/files/collectd-%{version}.tar.bz2 @@ -11,7 +11,7 @@ Patch7: collectd-fix-config.patch Patch9: collectd-version.patch Patch10: collectd-perl-vendor.patch -Patch11: collectd-Werror.patch +#Patch11: collectd-Werror.patch URL: http://verplant.org/collectd/ Group: System/Monitoring License: GNU General Public License (GPL) @@ -67,7 +67,7 @@ %patch7 %patch9 %patch10 -%patch11 +#%patch11 %__sed -i 's\|@@VERSION@@\|%{version}\|g' configure.in %build @@ -127,14 +127,17 @@ %{_sbindir}/collectd %{_sbindir}/collectdmon %dir %{_libdir}/collectd -%{_libdir}/collectd/types.db +%{_datadir}/collectd/types.db %{_libdir}/collectd/.so %{_libdir}/collectd/.la +%{_libdir}/libcollectdclient.* +%{_libdir}/pkgconfig/libcollectdclient.pc %{perl_vendorlib}/Collectd.pm %dir %{perl_vendorlib}/Collectd %{perl_vendorlib}/Collectd/* %{perl_vendorarch}/auto/Collectd %{_datadir}/collectd/postgresql_default.conf +%{_includedir}/%{name}/.h %doc %{_mandir}/man1/collectd.1 %doc %{_mandir}/man1/collectd-nagios.1* %doc %{_mandir}/man1/collectdmon.1*
[-] [+]	Changed	collectd-fix-config.patch ^
@@ -1,5 +1,5 @@ ---- src/collectd.conf.in.orig 2008-02-18 20:57:18.000000000 +0100 -+++ src/collectd.conf.in 2008-02-20 12:41:25.000000000 +0100 +--- src/collectd.conf.in.orig 2009-02-22 19:40:05.000000000 +0100 ++++ src/collectd.conf.in 2009-02-23 20:44:31.000000000 +0100 @@ -6,10 +6,10 @@ #Hostname "localhost" @@ -7,15 +7,15 @@ -#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@" -#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid" -#PluginDir "@prefix@/lib/@PACKAGE_NAME@" --#TypesDB "@prefix@/lib/@PACKAGE_NAME@/types.db" +-#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db" +#BaseDir "/var/lib/@PACKAGE_NAME@" +#PIDFile "/var/run/@PACKAGE_NAME@.pid" +#PluginDir "/lib/@PACKAGE_NAME@" -+#TypesDB "/lib/@PACKAGE_NAME@/types.db" ++#TypesDB "/share/@PACKAGE_NAME@/types.db" #Interval 10 #ReadThreads 5 -@@ -76,7 +76,7 @@ +@@ -131,7 +131,7 @@ #</Plugin> #<Plugin csv> @@ -24,7 +24,7 @@ # StoreRates false #</Plugin> -@@ -94,7 +94,7 @@ +@@ -189,7 +189,7 @@ #</Plugin> #<Plugin email> @@ -33,7 +33,7 @@ # SocketGroup "collectd" # SocketPerms "0770" # MaxConns 5 -@@ -213,7 +213,7 @@ +@@ -423,7 +423,7 @@ #</Plugin> #<Plugin rrdtool> @@ -42,7 +42,7 @@ # CacheTimeout 120 # CacheFlush 900 #</Plugin> -@@ -278,7 +278,7 @@ +@@ -514,7 +514,7 @@ #</Plugin> #<Plugin unixsock>
[-] [+]	Added	collectd-fix-config.patch.bak ^
@@ -0,0 +1,53 @@ +--- src/collectd.conf.in.orig 2008-02-18 20:57:18.000000000 +0100 ++++ src/collectd.conf.in 2008-02-20 12:41:25.000000000 +0100 +@@ -6,10 +6,10 @@ + + #Hostname "localhost" + FQDNLookup true +-#BaseDir "@prefix@/var/lib/@PACKAGE_NAME@" +-#PIDFile "@prefix@/var/run/@PACKAGE_NAME@.pid" +-#PluginDir "@prefix@/lib/@PACKAGE_NAME@" +-#TypesDB "@prefix@/lib/@PACKAGE_NAME@/types.db" ++#BaseDir "/var/lib/@PACKAGE_NAME@" ++#PIDFile "/var/run/@PACKAGE_NAME@.pid" ++#PluginDir "/lib/@PACKAGE_NAME@" ++#TypesDB "/lib/@PACKAGE_NAME@/types.db" + #Interval 10 + #ReadThreads 5 + +@@ -76,7 +76,7 @@ + #</Plugin> + + #<Plugin csv> +-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv" ++# DataDir "/var/lib/@PACKAGE_NAME@/csv" + # StoreRates false + #</Plugin> + +@@ -94,7 +94,7 @@ + #</Plugin> + + #<Plugin email> +-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email" ++# SocketFile "/var/run/@PACKAGE_NAME@-email" + # SocketGroup "collectd" + # SocketPerms "0770" + # MaxConns 5 +@@ -213,7 +213,7 @@ + #</Plugin> + + #<Plugin rrdtool> +-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd" ++# DataDir "/var/lib/@PACKAGE_NAME@/rrd" + # CacheTimeout 120 + # CacheFlush 900 + #</Plugin> +@@ -278,7 +278,7 @@ + #</Plugin> + + #<Plugin unixsock> +-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock" ++# SocketFile "/var/run/@PACKAGE_NAME@-unixsock" + # SocketGroup "collectd" + # SocketPerms "0660" + #</Plugin>
[-] [+]	Changed	collectd-perl-vendor.patch ^
@@ -1,6 +1,6 @@ ---- bindings/Makefile.am.orig 2008-01-26 20:33:23.000000000 +0100 -+++ bindings/Makefile.am 2008-01-26 20:33:44.000000000 +0100 -@@ -3,7 +3,7 @@ +--- bindings/Makefile.am.orig 2009-02-23 22:26:53.000000000 +0100 ++++ bindings/Makefile.am 2009-02-23 22:27:18.000000000 +0100 +@@ -4,7 +4,7 @@ all-local: @PERL_BINDINGS@ install-exec-local:
[-] [+]	Added	collectd-perl-vendor.patch.bak ^
@@ -0,0 +1,11 @@ +--- bindings/Makefile.am.orig 2008-01-26 20:33:23.000000000 +0100 ++++ bindings/Makefile.am 2008-01-26 20:33:44.000000000 +0100 +@@ -3,7 +3,7 @@ + all-local: @PERL_BINDINGS@ + + install-exec-local: +- [ ! -f perl/Makefile ] \|\| ( cd perl && $(MAKE) install ) ++ [ ! -f perl/Makefile ] \|\| ( cd perl && $(MAKE) install_vendor ) + + clean-local: + [ ! -f perl/Makefile ] \|\| ( cd perl && $(MAKE) realclean )
	Added	collectd-4.6.1.tar.bz2 ^