diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-02-22 08:31:39 -0500 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-03-03 15:40:01 -0800 |
| commit | fdd8fc6f82e3b47eb47c82335f79552610596913 (patch) | |
| tree | 6cbbca6a39cad6727e872e0cec0115965744378c | |
| parent | 4961f6329128392691d1fce7fb236de05278611d (diff) | |
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.
Change-Id: I07bd6a8714a05e8b91adc03f101032c1593da360
BUG: 1310437
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/13485
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index c000f72a414..d7a15521597 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -410,14 +410,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 @@ -706,23 +698,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 @@ -920,11 +895,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 |