rpms/kguitar/devel kguitar-automake111.patch, NONE, 1.1 kguitar.spec, 1.3, 1.4

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/kguitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6378

Modified Files:
	kguitar.spec 
Added Files:
	kguitar-automake111.patch 
Log Message:
* Thu Jun 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-6.926svn
- Patch to enable build with automake-1.11 or higher
- Update scriptlets according to the new guidelines


kguitar-automake111.patch:

--- NEW FILE kguitar-automake111.patch ---
diff -rupN kguitar.old/admin/cvs.sh kguitar/admin/cvs.sh
--- kguitar.old/admin/cvs.sh	2008-01-04 18:00:37.000000000 -0500
+++ kguitar/admin/cvs.sh	2009-06-11 13:07:13.000000000 -0400
@@ -66,7 +66,7 @@ case $AUTOMAKE_STRING in
     echo "*** KDE requires automake $required_automake_version"
     exit 1
     ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* ) : ;;
+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.[1-9][0-9]* ) : ;;
   "" )
     echo "*** AUTOMAKE NOT FOUND!."
     echo "*** KDE requires automake $required_automake_version"


Index: kguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kguitar/devel/kguitar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kguitar.spec	11 Jun 2009 04:53:09 -0000	1.3
+++ kguitar.spec	11 Jun 2009 17:49:28 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		  kguitar
 Version:	  0.5.1
-Release:	  5.%{svnver}%{?dist}
+Release:	  6.%{svnver}%{?dist}
 Group:		  Applications/Multimedia
 Summary:	  Guitar Tabulature Music Editor
 License:	  GPLv2+
@@ -13,9 +13,16 @@ Source0:	  %{name}-%{version}-%{svnver}.
 Source1:	  %{name}.desktop
 # To fetch the svn trunk:
 Source9:	  %{name}-snapshot.sh
+# Patch to make kguitar build with automake 1.11 or higher
+# https://sourceforge.net/tracker/?func=detail&aid=2804980&group_id=7693&atid=307693
+Patch0:		  %{name}-automake111.patch
 BuildRoot:	  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	  autoconf automake17 gettext 
-BuildRequires:	  kdelibs3-devel tse3-devel texlive-texmf
+BuildRequires:	  autoconf
+BuildRequires:	  automake
+BuildRequires:	  gettext 
+BuildRequires:	  kdelibs3-devel
+BuildRequires:	  texlive-texmf
+BuildRequires:	  tse3-devel
 
 %description
 KGuitar is a powerful KDE-based music tabulature editor with support of
@@ -44,6 +51,7 @@ Kguitar.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .automake111
 
 # Add more mime-types since the software is capable of handling them.
 sed -i 's|\*.kg|\*.kg;\*.gp3;\*.gp4;\*.mid;\*.tab;\*.xml|' %{name}/x-%{name}.desktop
@@ -82,17 +90,19 @@ install -pm 644 %{name}_shell/kgtabs.tex
 
 %find_lang %{name}
 
-%post 
-touch --no-create %{_datadir}/icons/{hi,lo}color
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%post
+touch --no-create %{_datadir}/icons/locolor &>/dev/null
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/locolor &>/dev/null
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%postun 
-touch --no-create %{_datadir}/icons/{hi,lo}color
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %post tex -p /usr/bin/texhash
 
@@ -121,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_texmf_main}/tex/generic/kgtabs
 
 %changelog
+* Thu Jun 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-6.926svn
+- Patch to enable build with automake-1.11 or higher
+- Update scriptlets according to the new guidelines
+
 * Thu Jun 11 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-5.926svn
 - BR automake17 because kguitar doesn't build with automake-1.11