From 49da065720919faeb98bae418eccb24498230788 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Thu, 3 Mar 2016 19:08:11 -0500 Subject: packaging: gratuitous dependencies on rsyslog-mm{count,jsonparse} remove unnecessary dependencies. GlusterFS only ships example config files, and the system may not actually be using rsyslog at all. (It may only be RHEL5 that uses rsyslog "out of the box.") Also, several example config files (including gluster-rsyslog-7.2.conf, gluster-rsyslog-5.8.conf, logger.conf.example) are already installed in /etc/glusterfs/ by `make install` in the extras directory and are included in the -server RPM. Installing them (anywhere) in the spec file is redundant. Furthermore, a query in the fedora-devel mailing list about the preferred location for these files went unanswered. Backport of >Change-Id: I07bd6a8714a05e8b91adc03f101032c1593da360 >BUG: 1310437 >Reviewed-on: http://review.gluster.org/13485 Change-Id: Ib1cc3cd5ab21f7f94631338aa77c3c1aea60b42a BUG: 1314571 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/13600 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- glusterfs.spec.in | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index d277c661ec7..a142b9034a3 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -412,14 +412,6 @@ This package provides support to geo-replication. %package libs Summary: GlusterFS common libraries Group: Applications/File -%if ( 0%{!?_without_syslog:1} ) -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) -Requires: rsyslog-mmjsonparse -%endif -%if ( 0%{?rhel} && 0%{?rhel} == 6 ) -Requires: rsyslog-mmcount -%endif -%endif %description libs GlusterFS is a distributed file-system capable of scaling to several @@ -734,23 +726,6 @@ install -D -p -m 0644 extras/glusterfs-georep-logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-georep %endif -%if ( 0%{!?_without_syslog:1} ) -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) -install -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \ - %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example -%endif - -%if ( 0%{?rhel} && 0%{?rhel} == 6 ) -install -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \ - %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf.example -%endif - -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) -install -D -p -m 0644 extras/logger.conf.example \ - %{buildroot}%{_sysconfdir}/glusterfs/logger.conf.example -%endif -%endif - # the rest of the ghosts touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info touch %{buildroot}%{_sharedstatedir}/glusterd/options @@ -948,11 +923,6 @@ fi ## %files %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README.md THANKS -%if ( 0%{!?_without_syslog:1} ) -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) -%{_sysconfdir}/rsyslog.d/gluster.conf.example -%endif -%endif %{_mandir}/man8/*gluster*.8* %exclude %{_mandir}/man8/gluster.8* %dir %{_localstatedir}/log/glusterfs -- cgit