diff options
| author | Alan Pevec <apevec@redhat.com> | 2010-12-17 01:36:27 +0100 |
|---|---|---|
| committer | Alan Pevec <apevec@redhat.com> | 2010-12-17 13:38:19 +0100 |
| commit | d37b13abf3daa760002360ac58c384d7d7d4fa33 (patch) | |
| tree | 9c64f68c5e92735afb7aaa044fb5ac493193f300 | |
| parent | a9b5a4f6e38a5e7e3d3876d77c552d2abf347ea6 (diff) | |
| download | collectd-d37b13abf3daa760002360ac58c384d7d7d4fa33.tar.gz collectd-d37b13abf3daa760002360ac58c384d7d7d4fa33.tar.xz collectd-d37b13abf3daa760002360ac58c384d7d7d4fa33.zip | |
add missing build dependencies
and workaround for iptc library check
| -rw-r--r-- | collectd-4.10.2-iptc-check.patch | 20 | ||||
| -rw-r--r-- | collectd.spec | 5 |
2 files changed, 24 insertions, 1 deletions
diff --git a/collectd-4.10.2-iptc-check.patch b/collectd-4.10.2-iptc-check.patch new file mode 100644 index 0000000..7411fa7 --- /dev/null +++ b/collectd-4.10.2-iptc-check.patch @@ -0,0 +1,20 @@ +--- configure.orig 2010-11-27 11:10:52.000000000 +0100 ++++ configure 2010-12-17 13:36:46.072070312 +0100 +@@ -18677,13 +18677,13 @@ + # Check for the iptc_init symbol in the library. + if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno" + then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iptc_init in -liptc" >&5 +-$as_echo_n "checking for iptc_init in -liptc... " >&6; } +-if test "${ac_cv_lib_iptc_iptc_init+set}" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iptc_init in -lip4tc" >&5 ++$as_echo_n "checking for iptc_init in -lip4tc... " >&6; } ++if test "${ac_cv_lib_ip4tc_iptc_init+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-liptc $LIBS" ++LIBS="-liptc -lip6tc -lip4tc $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/collectd.spec b/collectd.spec index 744b064..fde0183 100644 --- a/collectd.spec +++ b/collectd.spec @@ -10,6 +10,7 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 Source1: collectd-httpd.conf Source2: collection.conf Patch1: %{name}-%{version}-include-collectd.d.patch +Patch2: %{name}-%{version}-iptc-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -33,9 +34,10 @@ BuildRequires: mysql-devel BuildRequires: OpenIPMI-devel BuildRequires: postgresql-devel BuildRequires: nut-devel -#BuildRequires: iptables-devel +BuildRequires: iptables-devel BuildRequires: liboping-devel BuildRequires: python-devel +BuildRequires: libgcrypt-devel %description collectd is a small daemon written in C for performance. It reads various @@ -176,6 +178,7 @@ This plugin collects information from virtualized guests. %prep %setup -q %patch1 -p1 +%patch2 -p1 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in |