Changes - j0ke.net Open Build Service

Changes of Revision 31

[-] [+]	Changed	collectd.spec
@@ -1,12 +1,13 @@ # norootforbuild Name: collectd -Version: 4.6.2 +Version: 4.7.2 Release: 1 Summary: Statistics Collection Daemon for filling RRD Files Source: http://verplant.org/collectd/files/collectd-%{version}.tar.bz2 Source1: collectd.suse.init Source2: collectd.apache2.conf +Source3: collectd-rpmlintrc Patch4: collectd-lib64.patch Patch7: collectd-fix-config.patch Patch9: collectd-version.patch @@ -23,6 +24,7 @@ BuildRequires: freetype2-devel libart_lgpl-devel libnotify-devel BuildRequires: net-snmp-devel libxml2-devel libvirt-devel postgresql-devel BuildRequires: bind-devel +BuildRequires: libgcrypt-devel BuildRequires: kernel-source @@ -80,6 +82,7 @@ %__sed -i 's\|@@VERSION@@\|%{version}\|g' configure.in %build +mkdir -p libltdl/m4 autoreconf -fiv %configure \ @@ -140,6 +143,7 @@ %{_datadir}/collectd/types.db %{_libdir}/collectd/.so %{_libdir}/collectd/.la +%{_libdir}/collectd/.a %{_libdir}/libcollectdclient. %{_libdir}/pkgconfig/libcollectdclient.pc %{perl_vendorlib}/Collectd.pm @@ -159,6 +163,7 @@ %doc %{_mandir}/man5/collectd-perl.5* %doc %{_mandir}/man5/collectd-unixsock.5* %doc %{_mandir}/man5/types.db.5* +%doc %{_mandir}/man5/collectd-java.5* %doc %{perl_man3dir}/Collectd::Unixsock.%{perl_man3ext}* %dir %{_localstatedir}/lib/collectd /etc/init.d/collectd @@ -173,6 +178,12 @@ /srv/www/collectd %changelog +* Fri Jul 24 2009 Carsten Schoene <cs@linux-administrator.com> - 4.7.2-1 +- new upstream version + +* Sat May 16 2009 Carsten Schoene <cs@linux-administrator.com> - 4.7.0-1 +- new upstream version + * Thu Mar 19 2009 Carsten Schoene <cs@linux-administrator.com> - 4.6.2-1 - new upstream version
[-] [+]	Changed	collectd-Werror.patch ^
@@ -1,6 +1,6 @@ ---- configure.in.orig 2009-02-23 23:03:36.000000000 +0100 -+++ configure.in 2009-02-23 23:03:48.000000000 +0100 -@@ -1887,7 +1887,7 @@ +--- configure.orig 2009-05-16 14:00:57.000000000 +0200 ++++ configure 2009-05-16 14:01:15.000000000 +0200 +@@ -39780,7 +39780,7 @@ SAVE_LDFLAGS=$LDFLAGS # trigger an error if Perl_load_module() uses __attribute__nonnull__(3) # (see issues #41 and #42) @@ -8,54 +8,43 @@ + CFLAGS="$CFLAGS $PERL_CFLAGS -Wall" LDFLAGS="$LDFLAGS $PERL_LDFLAGS" - AC_CACHE_CHECK([for broken Perl_load_module()], ---- src/Makefile.am.orig 2009-02-23 23:04:37.000000000 +0100 -+++ src/Makefile.am 2009-02-23 23:04:57.000000000 +0100 -@@ -10,7 +10,7 @@ - endif - - if COMPILER_IS_GCC --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - endif + { $as_echo "$as_me:$LINENO: checking for broken Perl_load_module()" >&5 +--- configure.in.orig 2009-05-16 14:01:03.000000000 +0200 ++++ configure.in 2009-05-16 14:01:23.000000000 +0200 +@@ -2308,7 +2308,7 @@ + SAVE_LDFLAGS=$LDFLAGS + # trigger an error if Perl_load_module() uses __attribute__nonnull__(3) + # (see issues #41 and #42) +- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" - AM_CPPFLAGS = -DPREFIX='"${prefix}"' ---- src/Makefile.in.orig 2009-02-23 23:04:42.000000000 +0100 -+++ src/Makefile.in 2009-02-23 23:05:07.000000000 +0100 -@@ -1339,7 +1339,7 @@ + AC_CACHE_CHECK([for broken Perl_load_module()], +--- src/Makefile.in.orig 2009-05-16 14:03:20.000000000 +0200 ++++ src/Makefile.in 2009-05-16 14:03:26.000000000 +0200 +@@ -1495,7 +1495,7 @@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) \ - $(am__append_3) + SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) -@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ ---- src/liboping/Makefile.in.orig 2009-02-23 23:06:35.000000000 +0100 -+++ src/liboping/Makefile.in 2009-02-23 23:06:45.000000000 +0100 -@@ -235,7 +235,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign no-dependencies --@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror -+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall - EXTRA_DIST = AUTHORS COPYING ChangeLog README - noinst_LTLIBRARIES = liboping.la - ---- src/liboping/Makefile.am.orig 2009-02-23 23:06:39.000000000 +0100 -+++ src/liboping/Makefile.am 2009-02-23 23:06:53.000000000 +0100 -@@ -1,7 +1,7 @@ - AUTOMAKE_OPTIONS = foreign no-dependencies +--- src/Makefile.am.orig 2009-05-16 14:03:17.000000000 +0200 ++++ src/Makefile.am 2009-05-16 14:03:37.000000000 +0200 +@@ -7,7 +7,7 @@ + endif if COMPILER_IS_GCC -AM_CFLAGS = -Wall -Werror +AM_CFLAGS = -Wall endif - EXTRA_DIST = AUTHORS COPYING ChangeLog README ---- src/libcollectdclient/Makefile.in.orig 2009-02-23 23:06:04.000000000 +0100 -+++ src/libcollectdclient/Makefile.in 2009-02-23 23:06:14.000000000 +0100 -@@ -250,7 +250,7 @@ + AM_CPPFLAGS = -DPREFIX='"${prefix}"' +--- src/libcollectdclient/Makefile.in.orig 2009-05-16 14:01:43.000000000 +0200 ++++ src/libcollectdclient/Makefile.in 2009-05-16 14:01:55.000000000 +0200 +@@ -276,7 +276,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies @@ -64,8 +53,8 @@ pkginclude_HEADERS = client.h lcc_features.h lib_LTLIBRARIES = libcollectdclient.la nodist_pkgconfig_DATA = libcollectdclient.pc ---- src/libcollectdclient/Makefile.am.orig 2009-02-23 23:06:07.000000000 +0100 -+++ src/libcollectdclient/Makefile.am 2009-02-23 23:06:21.000000000 +0100 +--- src/libcollectdclient/Makefile.am.orig 2009-05-16 14:01:48.000000000 +0200 ++++ src/libcollectdclient/Makefile.am 2009-05-16 14:02:02.000000000 +0200 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies @@ -75,9 +64,9 @@ endif pkginclude_HEADERS = client.h lcc_features.h ---- src/libiptc/Makefile.in.orig 2009-02-23 23:07:15.000000000 +0100 -+++ src/libiptc/Makefile.in 2009-02-23 23:07:21.000000000 +0100 -@@ -234,7 +234,7 @@ +--- src/libiptc/Makefile.in.orig 2009-05-16 14:05:10.000000000 +0200 ++++ src/libiptc/Makefile.in 2009-05-16 14:02:27.000000000 +0200 +@@ -260,7 +260,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies EXTRA_DIST = libiptc.c README.collectd @@ -86,8 +75,8 @@ noinst_LTLIBRARIES = libiptc.la libiptc_la_CFLAGS = -I$(KERNEL_DIR)/include libiptc_la_SOURCES = libip4tc.c libip6tc.c \ ---- src/libiptc/Makefile.am.orig 2009-02-23 23:07:07.000000000 +0100 -+++ src/libiptc/Makefile.am 2009-02-23 23:07:28.000000000 +0100 +--- src/libiptc/Makefile.am.orig 2009-05-16 14:04:24.000000000 +0200 ++++ src/libiptc/Makefile.am 2009-05-16 14:02:34.000000000 +0200 @@ -3,7 +3,7 @@ EXTRA_DIST = libiptc.c README.collectd
[-] [+]	Added	collectd-Werror.patch.old ^
@@ -0,0 +1,99 @@ +--- configure.in.orig 2009-02-23 23:03:36.000000000 +0100 ++++ configure.in 2009-02-23 23:03:48.000000000 +0100 +@@ -1887,7 +1887,7 @@ + SAVE_LDFLAGS=$LDFLAGS + # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) + # (see issues #41 and #42) +- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" ++ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall" + LDFLAGS="$LDFLAGS $PERL_LDFLAGS" + + AC_CACHE_CHECK([for broken Perl_load_module()], +--- src/Makefile.am.orig 2009-02-23 23:04:37.000000000 +0100 ++++ src/Makefile.am 2009-02-23 23:04:57.000000000 +0100 +@@ -10,7 +10,7 @@ + endif + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + AM_CPPFLAGS = -DPREFIX='"${prefix}"' +--- src/Makefile.in.orig 2009-02-23 23:04:42.000000000 +0100 ++++ src/Makefile.in 2009-02-23 23:05:07.000000000 +0100 +@@ -1339,7 +1339,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) \ + $(am__append_3) +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ + -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ + -DLOCALSTATEDIR='"${localstatedir}"' \ +--- src/liboping/Makefile.in.orig 2009-02-23 23:06:35.000000000 +0100 ++++ src/liboping/Makefile.in 2009-02-23 23:06:45.000000000 +0100 +@@ -235,7 +235,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + EXTRA_DIST = AUTHORS COPYING ChangeLog README + noinst_LTLIBRARIES = liboping.la + +--- src/liboping/Makefile.am.orig 2009-02-23 23:06:39.000000000 +0100 ++++ src/liboping/Makefile.am 2009-02-23 23:06:53.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = foreign no-dependencies + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + EXTRA_DIST = AUTHORS COPYING ChangeLog README +--- src/libcollectdclient/Makefile.in.orig 2009-02-23 23:06:04.000000000 +0100 ++++ src/libcollectdclient/Makefile.in 2009-02-23 23:06:14.000000000 +0100 +@@ -250,7 +250,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + pkginclude_HEADERS = client.h lcc_features.h + lib_LTLIBRARIES = libcollectdclient.la + nodist_pkgconfig_DATA = libcollectdclient.pc +--- src/libcollectdclient/Makefile.am.orig 2009-02-23 23:06:07.000000000 +0100 ++++ src/libcollectdclient/Makefile.am 2009-02-23 23:06:21.000000000 +0100 +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = foreign no-dependencies + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + pkginclude_HEADERS = client.h lcc_features.h +--- src/libiptc/Makefile.in.orig 2009-02-23 23:07:15.000000000 +0100 ++++ src/libiptc/Makefile.in 2009-02-23 23:07:21.000000000 +0100 +@@ -234,7 +234,7 @@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign no-dependencies + EXTRA_DIST = libiptc.c README.collectd +-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror ++@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall + noinst_LTLIBRARIES = libiptc.la + libiptc_la_CFLAGS = -I$(KERNEL_DIR)/include + libiptc_la_SOURCES = libip4tc.c libip6tc.c \ +--- src/libiptc/Makefile.am.orig 2009-02-23 23:07:07.000000000 +0100 ++++ src/libiptc/Makefile.am 2009-02-23 23:07:28.000000000 +0100 +@@ -3,7 +3,7 @@ + EXTRA_DIST = libiptc.c README.collectd + + if COMPILER_IS_GCC +-AM_CFLAGS = -Wall -Werror ++AM_CFLAGS = -Wall + endif + + noinst_LTLIBRARIES = libiptc.la
	Deleted	collectd-4.3.1.tar.bz2 ^
	Deleted	collectd-4.3.2.tar.bz2 ^
	Deleted	collectd-4.3.3.tar.bz2 ^
	Deleted	collectd-4.4.1.tar.bz2 ^
	Deleted	collectd-4.4.2.tar.bz2 ^
	Deleted	collectd-4.4.3.tar.bz2 ^
	Deleted	collectd-4.5.0.tar.bz2 ^
	Deleted	collectd-4.5.2.tar.bz2 ^
	Changed	collectd-4.6.4.tar.bz2 ^
	Changed	collectd-4.7.0.tar.bz2 ^
	Changed	collectd-4.7.2.tar.bz2 ^
[-] [+]	Added	collectd-rpmlintrc ^
@@ -0,0 +1 @@ +addFilter("devel-file-in-non-devel-package")