diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2014-08-05 08:29:42 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-10-28 01:41:28 -0700 |
| commit | c35135c8da3542f377dcb22d121d255eb796a819 (patch) | |
| tree | 6fda6f6c724a937555390a64fda0ff7485aa0c26 /glusterfs.spec.in | |
| parent | 42150856c117bd53427f297664106d8db771a33e (diff) | |
glusterfs.spec.in: use upstream logrotate exclusively
retiring Fedora dist-git *.logrotate files
Change-Id: I6a94aac6f45573216de3f9e673d10db6de5ccb98
BUG: 1126832
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/8418
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 2caecddce97..eb2bff253e7 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -158,9 +158,6 @@ URL: http://www.gluster.org/docs/index.php/GlusterFS Source0: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig -Source3: glusterfs-fuse.logrotate -Source4: glusterd.logrotate -Source5: glusterfsd.logrotate Source6: rhel5-load-fuse-modules Source7: glusterfsd.service Source8: glusterfsd.init @@ -604,21 +601,8 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha %_init_install %{glusterfsd_service} glusterfsd %endif -%if ( 0%{_for_fedora_koji_builds} ) -# Client logrotate entry -install -D -p -m 0644 %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs-fuse - -# Server logrotate entry -install -D -p -m 0644 %{SOURCE4} \ - %{buildroot}%{_sysconfdir}/logrotate.d/glusterd -# Legacy server logrotate entry -install -D -p -m 0644 %{SOURCE5} \ - %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd -%else install -D -p -m 0644 extras/glusterfs-logrotate \ %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs -%endif %if ( 0%{!?_without_georeplication:1} ) # geo-rep ghosts @@ -834,7 +818,7 @@ fi ## %files %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS -%config(noreplace) %{_sysconfdir}/logrotate.d/* +%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs %config(noreplace) %{_sysconfdir}/sysconfig/* %if ( 0%{!?_without_syslog:1} ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) @@ -909,9 +893,6 @@ fi %endif %files fuse -%if ( 0%{_for_fedora_koji_builds} ) -%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse -%endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse* /sbin/mount.glusterfs %if ( 0%{!?_without_fusermount:1} ) @@ -925,7 +906,7 @@ fi %if ( 0%{!?_without_georeplication:1} ) %files geo-replication -%{_sysconfdir}/logrotate.d/glusterfs-georep +%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-georep %{_libexecdir}/glusterfs/gsyncd %{_libexecdir}/glusterfs/python/syncdaemon/* %{_libexecdir}/glusterfs/gverify.sh @@ -967,16 +948,12 @@ fi %files server %doc extras/clear_xattrs.sh -%if ( 0%{_for_fedora_koji_builds} ) -%config(noreplace) %{_sysconfdir}/logrotate.d/glusterd -%endif %config(noreplace) %{_sysconfdir}/sysconfig/glusterd %config(noreplace) %{_sysconfdir}/glusterfs %dir %{_sharedstatedir}/glusterd/groups %config(noreplace) %{_sharedstatedir}/glusterd/groups/virt # Legacy configs %if ( 0%{_for_fedora_koji_builds} ) -%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %endif %config %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh @@ -1050,6 +1027,9 @@ fi * Fri Sep 5 2014 Lalatendu Mohanty <lmohanty@redhat.com> - Changed the description as "GlusterFS a distributed filesystem" +* Tue Aug 5 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- logrotate files (#1126832) + * Wed Jul 16 2014 Luis Pabon <lpabon@redhat.com> - Added cmockery2 dependency |