[bacula/el5] Rename patches

Simone Caronni slaanesh at fedoraproject.org
Wed Jul 18 14:27:45 UTC 2012


commit f8fa60bca6a03e5dde274120aae76a151de0445d
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Jul 18 16:27:23 2012 +0200

    Rename patches

 bacula-config.patch => bacula-2.4.4-config.patch   |    0
 ...ch => bacula-2.4.4-director-configuration.patch |    0
 bacula-pamd.patch => bacula-2.4.4-pamd.patch       |    0
 bacula.spec                                        |   13 +++++++------
 4 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/bacula-config.patch b/bacula-2.4.4-config.patch
similarity index 100%
rename from bacula-config.patch
rename to bacula-2.4.4-config.patch
diff --git a/bacula-director-configuration.patch b/bacula-2.4.4-director-configuration.patch
similarity index 100%
rename from bacula-director-configuration.patch
rename to bacula-2.4.4-director-configuration.patch
diff --git a/bacula-pamd.patch b/bacula-2.4.4-pamd.patch
similarity index 100%
rename from bacula-pamd.patch
rename to bacula-2.4.4-pamd.patch
diff --git a/bacula.spec b/bacula.spec
index fcf4ec0..6969ab6 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -19,9 +19,9 @@ Source7:        %{name}-fd.init
 Source8:        %{name}-dir.init
 Source9:        %{name}-sd.init
 
-Patch0:         %{name}-director-configuration.patch
-Patch1:         %{name}-config.patch
-Patch3:         %{name}-pamd.patch
+Patch0:         %{name}-2.4.4-director-configuration.patch
+Patch1:         %{name}-2.4.4-config.patch
+Patch3:         %{name}-2.4.4-pamd.patch
 
 BuildRequires:  atk-devel
 BuildRequires:  bonobo-activation-devel
@@ -304,9 +304,9 @@ This development package contains static libraries and header files.
 
 # Patching and other source preparation
 pushd %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
+%patch0 -p1 -b .director-configuration
+%patch1 -p1 -b .config
+%patch3 -p1 -b .pamd
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -994,6 +994,7 @@ fi
   http://lists.fedoraproject.org/pipermail/packaging/2011-December/008034.html
 - Add devel subpackage.
 - Remove docs subpackage.
+- Rename patches and delete unused ones from git.
 
 * Wed Jul 18 2012 Simone Caronni <negativo17 at gmail.com> 2.4.4-3
 - Removed commented stuff that will never come back.


More information about the scm-commits mailing list