rpms/mtpaint/devel .cvsignore, 1.3, 1.4 mtpaint.spec, 1.5, 1.6 sources, 1.3, 1.4

[Christoph Wickert]

Author: cwickert

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

Modified Files:
	.cvsignore mtpaint.spec sources 
Log Message:
* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.31-1
- Update to 3.31
- Make handbook package noarch
- New gtk-update-icon-cache scriptlets



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Aug 2008 17:29:45 -0000	1.3
+++ .cvsignore	19 Aug 2009 21:57:52 -0000	1.4
@@ -1,2 +1,2 @@
-mtpaint-3.21.tar.bz2
-mtpaint_handbook-3.21.zip
+mtpaint-3.31.tar.bz2
+mtpaint_handbook-3.31.zip


Index: mtpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/mtpaint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mtpaint.spec	25 Jul 2009 15:20:10 -0000	1.5
+++ mtpaint.spec	19 Aug 2009 21:57:52 -0000	1.6
@@ -1,8 +1,8 @@
-%define docver 3.21
+%define docver 3.31
 
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint
-Version:       3.21
+Version:       3.31
 Release:       3%{?dist}
 License:       GPLv3+
 Group:         Applications/Multimedia
@@ -28,6 +28,7 @@ Summary:  Handbook for the mtpaint paint
 Group:    Applications/Multimedia
 License:  GFDL
 Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description handbook
 Install this package is want to read the handbook for the painting
@@ -39,7 +40,7 @@ application mtpaint.
 %patch1 -p1
 
 # We have moved docs
-%{__sed} -i 's,#define HANDBOOK_LOCATION "/usr/doc/mtpaint/index.html",#define HANDBOOK_LOCATION "%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
+%{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
 
 %{__chmod} 0755 %{name}_handbook-%{docver}/docs/{en_GB,img,files,cs}
 dos2unix -k %{name}_handbook-%{docver}/docs/index.html
@@ -67,25 +68,25 @@ desktop-file-install --delete-original  
 %{__rm} -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 if [ -x %{_bindir}/update-desktop-database ] ; then
   %{_bindir}/update-desktop-database &> /dev/null
 fi
 exit 0
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor 
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 if [ -x %{_bindir}/update-desktop-database ] ; then
   %{_bindir}/update-desktop-database &> /dev/null
 fi
 exit 0
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc COPYING NEWS README
@@ -99,6 +100,11 @@ exit 0
 %doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*
 
 %changelog
+* Wed Aug 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 3.31-1
+- Update to 3.31
+- Make handbook package noarch
+- New gtk-update-icon-cache scriptlets
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mtpaint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Aug 2008 17:29:45 -0000	1.3
+++ sources	19 Aug 2009 21:57:52 -0000	1.4
@@ -1,2 +1,2 @@
-f685b6fbb16966dc5d343f0e63932027  mtpaint-3.21.tar.bz2
-6618cf04036226bfbf2993e86abe9b6c  mtpaint_handbook-3.21.zip
+fbe34eb25f96b6092403115f1f6ab387  mtpaint-3.31.tar.bz2
+40de347afa76e869f8251eb6134c3065  mtpaint_handbook-3.31.zip