[xscreensaver] Some misc change on spec file for git usage

[Mamoru TASAKA]

commit a0582951456c97645612fbc996ff19d89bac8a14
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sat Sep 13 21:35:09 2014 +0900

    Some misc change on spec file for git usage

 xscreensaver.spec |   60 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 15 deletions(-)
---
diff --git a/xscreensaver.spec b/xscreensaver.spec
index d8a0040..d7e3ba7 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    1
+%define fedora_rel    2
 
 %global use_clang_as_cc 0
 %global use_clang_analyze 0
@@ -53,19 +53,24 @@ Source12:        xscreensaver-autostart.desktop
 ## Patches
 ##
 # bug 129335
+%global PATCH1_desc \
 # sanitize the names of modes in barcode
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 ## Patches already sent to the upsteam
 ## Patches which must be discussed with upstream
 #
-# Change webcollage not to access to net
+%global PATCH21_desc \
+# Change webcollage not to access to net \
 # Also see bug 472061
 Patch21:         xscreensaver-5.26-webcollage-default-nonet.patch
 #
+%global PATCH32_desc \
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
+%global PATCH51_desc \
 # driver/test-passwd tty segfaults
 Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
+%global PATCH52_desc \
 # patch to compile driver/test-xdpms
 Patch52:         xscreensaver-5.12-tests-miscfix.patch
 # 
@@ -306,13 +311,16 @@ rm -f driver/XScreenSaver_ad.h
 %__git add .
 %__git commit -m "base"
 
-%patch1 -p1 -b .sanitize-hacks
-%patch21 -p1 -b .nonet
-%patch32 -p1 -b .dpmsoff_japo
-%patch51 -p1 -b .test_passwd
-%patch52 -p1 -b .test_misc
-
-%__git commit -m "Base patches committed" -a
+%patch1 -p1
+  %__git commit -m "%PATCH1_desc" -a
+%patch21 -p1
+  %__git commit -m "%PATCH21_desc" -a
+%patch32 -p1
+  %__git commit -m "%PATCH32_desc" -a
+%patch51 -p1
+  %__git commit -m "%PATCH51_desc" -a
+%patch52 -p1
+  %__git commit -m "%PATCH52_desc" -a
 
 
 change_option(){
@@ -351,6 +359,7 @@ silence_hack(){
    set -x
 }
 
+%global PATCH_desc \
 # change some files to UTF-8
 for f in \
    driver/XScreenSaver.ad.in \
@@ -360,8 +369,10 @@ for f in \
    touch -r $f $f.tmp
    mv $f.tmp $f
 done
+%__git commit -m "%PATCH_desc" -a
 
-# Change some options
+%global PATCH_desc \
+# Change some options \
 # For grabDesktopImages, lock, see bug 126809
 change_option driver/XScreenSaver.ad.in \
    captureStderr=False \
@@ -374,12 +385,16 @@ change_option driver/XScreenSaver.ad.in \
 %if 0%{?fedora} >= 12
    textURL=%{default_URL}
 %endif
+%__git commit -m "%PATCH_desc" -a
 
-# Disable the following hacks by default
+%global PATCH_desc \
+# Disable the following hacks by default \
 # (disable, not remove)
 silence_hack driver/XScreenSaver.ad.in \
    bsod flag
+%__git commit -m "%PATCH_desc" -a
 
+%global PATCH_desc \
 # Record time, EVR
 eval sed -i.ver \
    -e \'s\|version \[45\]\.\[0-9a-z\]\[0-9a-z\]\*\|version %{version}-`echo \
@@ -397,17 +412,22 @@ eval sed -i.ver \
    -e \'s\|5.\[0-9\]\[0-9\]\|%{version}-`echo %{release} | \
       sed -e '/IGNORE THIS/s|\.[a-zA-Z][a-zA-Z0-9].*$||'`\|\' \
    utils/version.h
+%__git commit -m "%PATCH_desc" -a
 
+%global PATCH_desc \
 # Move man entry to 6x (bug 197741)
 for f in `find hacks -name Makefile.in` ; do
    sed -i.mansuf \
       -e '/^mansuffix/s|6|6x|'\
       $f
 done
+%__git commit -m "%PATCH_desc" -a
 
+%global PATCH_desc \
 # Search first 6x entry, next 1 entry for man pages
 sed -i.manentry -e 's at man %%s at man 6x %%s 2>/dev/null || man 1 %%s @' \
    driver/XScreenSaver.ad.in
+%__git commit -m "%PATCH_desc" -a
 
 # Suppress rpmlint warnings.
 # suppress about pam config (although this is 
@@ -423,14 +443,17 @@ if [ -x %{_datadir}/libtool/config.guess ]; then
    cp -p %{_datadir}/libtool/config.{sub,guess} .
 fi
 
+%global PATCH_desc \
 # Fix for desktop-file-utils 0.14+
 %if 0%{?fedora} >= 9
 sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \
    driver/screensaver-properties.desktop.in
 %endif
+%__git commit -m "%PATCH_desc" -a || echo "Nothing changed"
 
-# Disable (don't build) some tests
-# apm: doesn't compile
+%global PATCH_desc \
+# Disable (don't build) some tests \
+# apm: doesn't compile \
 # mlstring: causes OOM - need check again
 sed -i.test \
    -e 's|test-apm[ \t][ \t]*t|t|' \
@@ -438,13 +461,17 @@ sed -i.test \
    -e 's|test-mlstring[ \t][ \t]*t|t|' \
 %endif
    driver/Makefile.in
+%__git commit -m "%PATCH_desc" -a
 
+%global PATCH_desc \
 # test-fade: give more time between fading
 sed -i.delay -e 's| delay = 1| delay = 3|' driver/test-fade.c
+%__git commit -m "%PATCH_desc" -a
+
+%global PATCH_desc \
 # test-grab: testing time too long, setting time 15 min -> 20 sec
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
-
-%__git commit -m "Misc confuguration for Fedora" -a
+%__git commit -m "%PATCH_desc" -a
 
 aclocal
 autoconf
@@ -935,6 +962,9 @@ exit 0
 %endif
 
 %changelog
+* Sat Sep 13 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.30-2
+- Some misc change on spec file for git usage
+
 * Fri Sep 12 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.30-1
 - Update to 5.30