[system-config-keyboard] use consistent names for patches, create backup files

Nils Philippsen nphilipp at fedoraproject.org
Thu Apr 18 13:22:43 UTC 2013


commit 8692687b4f0985abfac7cf57fa0e55e2272dfe53
Author: Nils Philippsen <nils at redhat.com>
Date:   Thu Apr 18 14:45:41 2013 +0200

    use consistent names for patches, create backup files

 ...eyboard-1.3.1-do_not_remove_the_OK_button.patch |    0
 ...tem-config-keyboard-1.3.1-no-pyxf86config.patch |    0
 system-config-keyboard.spec                        |   11 +++++++----
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/s-c-keyboard-do_not_remove_the_OK_button.patch b/system-config-keyboard-1.3.1-do_not_remove_the_OK_button.patch
similarity index 100%
rename from s-c-keyboard-do_not_remove_the_OK_button.patch
rename to system-config-keyboard-1.3.1-do_not_remove_the_OK_button.patch
diff --git a/sck-1.3.1-no-pyxf86config.patch b/system-config-keyboard-1.3.1-no-pyxf86config.patch
similarity index 100%
rename from sck-1.3.1-no-pyxf86config.patch
rename to system-config-keyboard-1.3.1-no-pyxf86config.patch
diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec
index fbc158e..c5394aa 100644
--- a/system-config-keyboard.spec
+++ b/system-config-keyboard.spec
@@ -22,8 +22,8 @@ Requires:       usermode >= 1.36
 
 Obsoletes:      kbdconfig
 Obsoletes:      redhat-config-keyboard
-Patch0:         s-c-keyboard-do_not_remove_the_OK_button.patch
-Patch1:         sck-1.3.1-no-pyxf86config.patch
+Patch0:         system-config-keyboard-1.3.1-do_not_remove_the_OK_button.patch
+Patch1:         system-config-keyboard-1.3.1-no-pyxf86config.patch
 
 
 %description
@@ -44,8 +44,8 @@ Base components of system-config-keyboard.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .do_not_remove_the_OK_button
+%patch1 -p1 -b .no-pyxf86config
 
 %build
 make
@@ -99,6 +99,9 @@ fi
 
 
 %changelog
+* Thu Apr 18 2013 Nils Philippsen <nils at redhat.com>
+- use consistent names for patches, create backup files
+
 * Fri Feb 15 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.3.1-11
 - Add dependency on newt-python (#845391, Sandro Mani).
 - Fix bogus dates in %%changelog and rpmlint tabs vs spaces warning.


More information about the scm-commits mailing list