[glusterfs/kk-el6] glusterfs-3.5.3beta2 release

Lalatendu Mohanty lalatendu at fedoraproject.org
Tue Nov 4 15:50:55 UTC 2014 

commit 4ff2d80e3de64fff5b525cc243d9191f19a2a075
Author: Lalatendu Mohanty <lmohanty at redhat.com>
Date:   Tue Nov 4 21:20:44 2014 +0530

    glusterfs-3.5.3beta2 release

 glusterfs.spec |  112 +++++++++++++++++++++++++++++++++-----------------------
 sources        |    2 +-
 2 files changed, 67 insertions(+), 47 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 0040979..bb41d2d 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -3,7 +3,7 @@
 %global _for_fedora_koji_builds 1
 
 # uncomment and add '%' to use the prereltag for pre-releases
-# %%global prereltag beta1
+%global prereltag beta2
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz --without rdma
@@ -80,8 +80,8 @@
 Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.5.2
-Release:          1%{?prereltag:.%{prereltag}}%{?dist}
+Version:          3.5.3
+Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -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
@@ -122,6 +119,7 @@ Requires(postun): systemd-units
 %define _init_enable()  /bin/systemctl enable %1.service ;
 %define _init_disable() /bin/systemctl disable %1.service ;
 %define _init_restart() /bin/systemctl try-restart %1.service ;
+%define _init_start()   /bin/systemctl start %1.service ;
 %define _init_stop()    /bin/systemctl stop %1.service ;
 %define _init_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ;
 # can't seem to make a generic macro that works
@@ -138,6 +136,7 @@ Requires(postun): /sbin/service
 %define _init_enable()  /sbin/chkconfig --add %1 ;
 %define _init_disable() /sbin/chkconfig --del %1 ;
 %define _init_restart() /sbin/service %1 condrestart &>/dev/null ;
+%define _init_start()   /sbin/service %1 start &>/dev/null ;
 %define _init_stop()    /sbin/service %1 stop &>/dev/null ;
 %define _init_install() install -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ;
 # can't seem to make a generic macro that works
@@ -196,7 +195,7 @@ Provides:         %{name}-core = %{version}-%{release}
 %endif
 
 %description
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -221,7 +220,7 @@ Requires:         rsyslog-mmcount
 %endif
 
 %description libs
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -237,7 +236,7 @@ Group:            Applications/File
 Requires:         %{name}-libs = %{version}-%{release}
 
 %description cli
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -256,7 +255,7 @@ BuildRequires:    librdmacm-devel
 Requires:         %{name} = %{version}-%{release}
 
 %description rdma
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -276,7 +275,7 @@ Requires:         %{name}-server = %{version}-%{release}
 Requires:         python python-ctypes
 
 %description geo-replication
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 peta-bytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file system in
@@ -298,7 +297,7 @@ Obsoletes:        %{name}-client < %{version}-%{release}
 Provides:         %{name}-client = %{version}-%{release}
 
 %description fuse
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -315,6 +314,7 @@ Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-cli = %{version}-%{release}
 Requires:         %{name}-libs = %{version}-%{release}
 Requires:         %{name}-fuse = %{version}-%{release}
+Requires:         psmisc
 #nfs-utils provides rpc.statd and it is a requirement for gluster-nfs
 Requires:         nfs-utils
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
@@ -327,7 +327,7 @@ Obsoletes:        %{name}-geo-replication = %{version}-%{release}
 %endif
 
 %description server
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -345,7 +345,7 @@ Requires:         %{name} = %{version}-%{release}
 Provides:         python-gluster = %{version}-%{release}
 
 %description api
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -363,7 +363,7 @@ Requires:         %{name}-api = %{version}-%{release}
 Requires:         python python-ctypes
 
 %description extra-xlators
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -394,7 +394,7 @@ Requires:         glusterfs-server
 Requires:         %{_prefix}/lib/ocf/resource.d
 
 %description resource-agents
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -415,7 +415,7 @@ Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-extra-xlators = %{version}-%{release}
 
 %description devel
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -432,7 +432,7 @@ Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-devel = %{version}-%{release}
 
 %description api-devel
-GlusterFS is a clustered file-system capable of scaling to several
+GlusterFS is a distributed file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
 or TCP/IP interconnect into one large parallel network file
 system. GlusterFS is one of the most sophisticated file systems in
@@ -585,21 +585,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 +679,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 )
@@ -726,9 +713,11 @@ rm -rf %{buildroot}
 %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
 %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
 
-%post libs -p /sbin/ldconfig
+%post libs
+/sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun libs
+/sbin/ldconfig
 
 %files libs
 %{_libdir}/*.so.*
@@ -751,7 +740,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 +761,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 +774,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
@@ -850,9 +832,11 @@ fi
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 
-%post api -p /sbin/ldconfig
+%post api
+/sbin/ldconfig
 
-%postun api -p /sbin/ldconfig
+%postun api
+/sbin/ldconfig
 
 %files api
 %exclude %{_libdir}/*.so
@@ -944,6 +928,9 @@ if [ $? -eq 0 ]; then
 
     killall --wait glusterd &> /dev/null
     glusterd --xlator-option *.upgrade=on -N
+    # glusterd _was_ running, we killed it, it exited after *.upgrade=on,
+    # so start it again
+    %_init_start glusterd
 else
     glusterd --xlator-option *.upgrade=on -N
 fi
@@ -967,6 +954,40 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Tue Nov 4 2014 Lalatendu Mohanty <lmohanty[at]redhat.com>
+- glusterfs-3.5.3beta2 release
+
+* Mon Oct 6 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- glusterfs-3.5.3beta1 release
+
+* Wed Oct 1 2014 Humble Chirammal <hchiramm at redhat.com>
+- glusterfs-3.6.0beta3 release
+
+* Thu Sep 25 2014  Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- add psmisc for -server
+- add smarter logic to restart glusterd in %%post server
+
+* Thu Sep 25 2014  Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- glusterfs-3.6.0beta2.tar.gz
+
+* Wed Sep 24 2014 Balamurugan Arumugam <barumuga at redhat.com>
+- remove /sbin/ldconfig as interpreter (#1145992)
+
+* Mon Sep 22 2014  Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- More make fedora  master glusterfs spec compatible with upstream GlusterFS 3.6 spec
+
+* Mon Sep 22 2014 Humble Chirammal <hchiramm at redhat.com>
+- Make fedora  master glusterfs spec compatible with upstream GlusterFS 3.6 spec
+
+* Fri Sep 5 2014 Lalatendu Mohanty <lmohanty at redhat.com>
+- Changed the description as "GlusterFS a distributed filesystem"
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Aug 5 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- use upstream logrotate files exclusively (#1126788)
+
 * Thu Jul 31 2014 Lalatendu Mohanty <lmohanty[at]redhat.com> - 3.5.2-1
 - GlusterFS 3.5.2 GA
 
@@ -976,7 +997,7 @@ fi
 * Wed Jul 9 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.5.1-2
 - glusterd.init, BZ 1073217
 
-* Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com>
+* Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
 - killall --wait in %%post server (#1113959, #1113745)
 
 * Wed Jun 25 2014 Vikhyat Umrao <vumrao at redhat.com>
@@ -1043,7 +1064,6 @@ fi
 - Correctly start+stop glusterfsd.service (#1022542)
 - fix "warning: File listed twice: .../glusterd.info" while building
 
-%changelog
 * Sat Oct 26 2013 Niels de Vos <ndevos at redhat.com>
 - add base-port config option to /etc/glusterd/glusterd.vol (#1023653)
 
diff --git a/sources b/sources
index 3323647..57a6e7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-715585ab441fbbff260ac7bb273b7f96  glusterfs-3.5.2.tar.gz
+989b6bd0e432f1757de419135307b652  glusterfs-3.5.3beta2.tar.gz

More information about the scm-commits mailing list