rpms/dia/F-7 dia.spec,1.20,1.21

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914

Modified Files:
	dia.spec 
Log Message:
* Tue Nov 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-4
- Fix help not showing due to an encoding error (bz 401291)



Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/F-7/dia.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dia.spec	10 Jun 2007 17:02:44 -0000	1.20
+++ dia.spec	27 Nov 2007 20:57:31 -0000	1.21
@@ -1,10 +1,10 @@
 Name:           dia
 Version:        0.96.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://www.gnome.org/projects/dia/
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.96/%{name}-%{version}.tar.bz2
 Patch1:         dia-0.92.2-dtd.patch
@@ -37,6 +37,8 @@
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
+iconv -f WINDOWS-1252 -t UTF8 doc/en/usage-layers.xml > usage-layers.xml.UTF-8
+mv usage-layers.xml.UTF-8 doc/en/usage-layers.xml
 
 
 %build
@@ -73,11 +75,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %clean
@@ -102,6 +108,12 @@
 
 
 %changelog
+* Tue Nov 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-4
+- Fix help not showing due to an encoding error (bz 401291)
+
+* Mon Aug  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-3
+- Update License tag for new Licensing Guidelines compliance
+
 * Sun Jun 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-2
 - Remove yelp Requires again <sigh> (bz 243330)