diff --git a/glusterfs.spec b/glusterfs.spec index 7f34bc1..28ccc18 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -96,9 +96,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 Source11: glusterfsd.service Source13: glusterfsd.init @@ -585,21 +582,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 @@ -692,7 +676,7 @@ rm -rf %{buildroot} %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 ) @@ -751,7 +735,7 @@ if [ $1 -ge 1 ]; then fi %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 @@ -772,9 +756,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} ) @@ -788,16 +769,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 # init files @@ -967,6 +944,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Tue Aug 5 2014 Kaleb S. KEITHLEY +- use upstream logrotate files exclusively (#1126788) + * Thu Jul 31 2014 Lalatendu Mohanty - 3.5.2-1 - GlusterFS 3.5.2 GA @@ -976,7 +956,7 @@ fi * Wed Jul 9 2014 Kaleb S. KEITHLEY - 3.5.1-2 - glusterd.init, BZ 1073217 -* Fri Jun 27 2014 Kaleb S. KEITHLEY +* Fri Jun 27 2014 Kaleb S. KEITHLEY - killall --wait in %%post server (#1113959, #1113745) * Wed Jun 25 2014 Vikhyat Umrao