[glusterfs] rename patch files for nicer co-existence with other packages in ~/rpmbuild/SOURCES

Kaleb S. KEITHLEY kkeithle at fedoraproject.org
Thu Feb 16 16:25:04 UTC 2012


commit 2906358bf6249a720feb25151402b6c6b1e836f3
Author: Kaleb KEITHLEY <kkeithle at redhat.com>
Date:   Thu Feb 16 11:24:06 2012 -0500

    rename patch files for nicer co-existence with other packages in
    ~/rpmbuild/SOURCES

 ....ac.patch => glusterfs-3.2.5.configure.ac.patch |    0
 ... => glusterfs-3.2.5.libglusterfs.Makefile.patch |    0
 glusterfs.spec                                     |   35 +++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac.patch b/glusterfs-3.2.5.configure.ac.patch
similarity index 100%
rename from configure.ac.patch
rename to glusterfs-3.2.5.configure.ac.patch
diff --git a/libglusterfs.Makefile.patch b/glusterfs-3.2.5.libglusterfs.Makefile.patch
similarity index 100%
rename from libglusterfs.Makefile.patch
rename to glusterfs-3.2.5.libglusterfs.Makefile.patch
diff --git a/glusterfs.spec b/glusterfs.spec
index 38f6f83..18efc63 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -25,7 +25,7 @@
 Summary:          Cluster File System
 Name:             glusterfs
 Version:          3.2.5
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv3
 Group:            System Environment/Base
 Vendor:           Red Hat
@@ -37,8 +37,8 @@ Source3:          umount.glusterfs
 Source4:          glusterfs-fuse.logrotate
 Source5:          glusterd.logrotate
 Source6:          glusterfsd.logrotate
-Patch0:           libglusterfs.Makefile.patch
-Patch1:           configure.ac.patch
+Patch0:           %{name}-3.2.5.libglusterfs.Makefile.patch
+Patch1:           %{name}-3.2.5.configure.ac.patch
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %if ( 0%{?fedora} && 0%{?fedora} < 17 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -393,48 +393,51 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
-* Mon Jan 16 2012 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-7
+* Thu Feb 16 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-8
+- rename patch files
+
+* Mon Jan 16 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-7
 - patch configure.ac to compile -O2 instead of -O0 on Linux.
 
-* Tue Jan 10 2012 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-6
+* Tue Jan 10 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-6
 - glusterd.init use /run per Fedora File System Layout, or /var/run when
   needed
 
-* Tue Jan 3 2012 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-5
+* Tue Jan 3 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-5
 - revised spec for init.d for fedora<=16, rhel<=6; native systemd for
   f17 and rhel7
 
-* Wed Dec 7 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-4
+* Wed Dec 7 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-4
 - revised sysconfig and init.d scripts. (glusterfsd.{init,sysconfig,service}
   should go away, as glusterd is responsible for starting and stopping it.)
 
-* Wed Nov 23 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-3
+* Wed Nov 23 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-3
 - revised libglusterfs/src/Makefile.* to (re)enable parallel make
 
-* Mon Nov 21 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-2
+* Mon Nov 21 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-2
 - rhel/epel, init.d for <=6, native systemd for 7
 
-* Thu Nov 17 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-1
+* Thu Nov 17 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.5-1
 - Update to 3.2.5
 
-* Wed Nov 16 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.4-3
+* Wed Nov 16 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.4-3
 - revised init.d/systemd to minimize fedora < 17
 - get closer to the official glusterfs spec, including...
 - add geo-replication, which should have been there since 3.2
 
-* Wed Nov 2 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.4-2
+* Wed Nov 2 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.4-2
 - Convert init.d to systemd for f17 and later
 
-* Fri Sep 30 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.4-1
+* Fri Sep 30 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.4-1
 - Update to 3.2.4
 
-* Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.3-1
+* Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.3-1
 - Update to 3.2.3 
 
-* Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.2-1
+* Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.2-1
 - Update to 3.2.2 
 
-* Fri Aug 19 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.2-0
+* Fri Aug 19 2011 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.2-0
 - Update to 3.2.2
 
 * Wed Jun 29 2011 Dan HorĂ¡k <dan[at]danny.cz> - 3.2.1-3


More information about the scm-commits mailing list