projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4'
[collectd.git]
/
contrib
/
redhat
/
collectd.spec
diff --git
a/contrib/redhat/collectd.spec
b/contrib/redhat/collectd.spec
index
29efd75
..
6507d5f
100644
(file)
--- a/
contrib/redhat/collectd.spec
+++ b/
contrib/redhat/collectd.spec
@@
-213,7
+213,7
@@
Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
License: GPLv2
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-root
License: GPLv2
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libgcrypt-devel, kernel-headers
+BuildRequires: libgcrypt-devel, kernel-headers
, libtool-ltdl-devel
Vendor: collectd development team <collectd@verplant.org>
Requires(post): chkconfig
Vendor: collectd development team <collectd@verplant.org>
Requires(post): chkconfig
@@
-1676,6
+1676,8
@@
find %{buildroot} -type f -name .packlist -delete
find %{buildroot} -type f -name perllocal.pod -delete
%if ! %{with_java}
find %{buildroot} -type f -name perllocal.pod -delete
%if ! %{with_java}
+rm -f %{buildroot}%{_datadir}/collectd/java/collectd-api.jar
+rm -f %{buildroot}%{_datadir}/collectd/java/generic-jmx.jar
rm -f %{buildroot}%{_mandir}/man5/collectd-java.5*
%endif
rm -f %{buildroot}%{_mandir}/man5/collectd-java.5*
%endif
@@
-1686,6
+1688,10
@@
rm -fr perl-examples/
rm -fr %{buildroot}/usr/lib/perl5/
%endif
rm -fr %{buildroot}/usr/lib/perl5/
%endif
+%if ! %{with_postgresql}
+rm -f %{buildroot}%{_datadir}/collectd/postgresql_default.conf
+%endif
+
%if ! %{with_python}
rm -f %{buildroot}%{_mandir}/man5/collectd-python.5*
%endif
%if ! %{with_python}
rm -f %{buildroot}%{_mandir}/man5/collectd-python.5*
%endif
@@
-1725,7
+1731,7
@@
fi
%{_bindir}/collectd-tg
%{_bindir}/collectdctl
%{_sbindir}/collectdmon
%{_bindir}/collectd-tg
%{_bindir}/collectdctl
%{_sbindir}/collectdmon
-%{_datadir}/collectd/
+%{_datadir}/collectd/
types.db
%{_sharedstatedir}/collectd
%{_mandir}/man1/collectd-nagios.1*
%{_mandir}/man1/collectd.1*
%{_sharedstatedir}/collectd
%{_mandir}/man1/collectd-nagios.1*
%{_mandir}/man1/collectd.1*
@@
-2027,8
+2033,8
@@
fi
%if %{with_java}
%files java
%if %{with_java}
%files java
-%{_
prefix}/share
/collectd/java/collectd-api.jar
-%{_
prefix}/share
/collectd/java/generic-jmx.jar
+%{_
datadir}
/collectd/java/collectd-api.jar
+%{_
datadir}
/collectd/java/generic-jmx.jar
%{_libdir}/%{name}/java.so
%{_mandir}/man5/collectd-java.5*
%endif
%{_libdir}/%{name}/java.so
%{_mandir}/man5/collectd-java.5*
%endif
@@
-2120,7
+2126,7
@@
fi
%if %{with_postgresql}
%files postgresql
%if %{with_postgresql}
%files postgresql
-%{_
prefix}/share
/collectd/postgresql_default.conf
+%{_
datadir}
/collectd/postgresql_default.conf
%{_libdir}/%{name}/postgresql.so
%endif
%{_libdir}/%{name}/postgresql.so
%endif