rpms/xzgv/F-11 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xzgv.spec, 1.9, 1.10 xzgv-0.9-svn-r41.patch, 1.1, NONE

[terjeros]

Author: terjeros

Update of /cvs/extras/rpms/xzgv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15729/F-11

Modified Files:
	.cvsignore sources xzgv.spec 
Removed Files:
	xzgv-0.9-svn-r41.patch 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Jan 2008 22:45:34 -0000	1.3
+++ .cvsignore	5 Dec 2009 20:32:17 -0000	1.4
@@ -1 +1 @@
-xzgv-0.9.tar.gz
+xzgv-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Jan 2008 22:45:34 -0000	1.3
+++ sources	5 Dec 2009 20:32:17 -0000	1.4
@@ -1 +1 @@
-7e2dfad595c97c2abbb392b61ea69f1b  xzgv-0.9.tar.gz
+d6452ebd4911d986fa1176086afb6e33  xzgv-0.9.1.tar.gz


Index: xzgv.spec
===================================================================
RCS file: /cvs/extras/rpms/xzgv/F-11/xzgv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xzgv.spec	26 Feb 2009 12:22:11 -0000	1.9
+++ xzgv.spec	5 Dec 2009 20:32:17 -0000	1.10
@@ -1,11 +1,10 @@
 Summary:   Picture viewer
 Name:      xzgv
-Version:   0.9
-Release:   6%{?dist}
+Version:   0.9.1
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/Multimedia
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:     xzgv-0.9-svn-r41.patch
 Patch1:    xzgv-0.9-fix-doc-install.patch
 Patch2:    xzgv-0.9-thumbnail-load-gcc4.patch
 Patch3:    xzgv-0.9-fix-thumbnail-generation.patch
@@ -23,10 +22,15 @@ zgv and the Gimp.
 
 %prep
 %setup -q
-%patch -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+iconv -f iso8859-1 -t utf8 ChangeLog -o ChangeLog.txt
+touch -r ChangeLog.txt ChangeLog
+mv ChangeLog.txt ChangeLog
+iconv -f iso8859-1 -t utf8 NEWS -o NEWS.txt
+touch -r NEWS.txt NEWS
+mv NEWS.txt NEWS
 
 %build
 %{__sed} -i 's|^CFLAGS.*|CFLAGS=%{optflags}|' config.mk
@@ -35,10 +39,10 @@ zgv and the Gimp.
 
 %{__cat} <<EOF > %{name}.desktop
 [Desktop Entry]
-Encoding=UTF-8
 Name=xzgv Image Viewer
 Comment=View different types of images
 Exec=xzgv
+Icon=xzgv
 Terminal=false
 Type=Application
 Categories=GTK;Graphics;RasterGraphics;Viewer;
@@ -49,6 +53,9 @@ EOF
 
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/applications/
 %{__install} -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+%{__install} -p -m 0644 src/icon-48.xpm \
+     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/xzgv.xpm
 
 %{__make} PREFIX=%{buildroot}/%{_prefix} \
      MANDIR=%{buildroot}/%{_mandir}/man1 \
@@ -60,6 +67,16 @@ desktop-file-install --vendor fedora --d
 
 %post
 /sbin/install-info %{_infodir}/xzgv.info.gz %{_infodir}/dir || :
+touch --no-create %{_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 || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %preun
 if [ "$1" = "0" ]; then
@@ -76,8 +93,19 @@ fi
 %{_mandir}/man1/%{name}*
 %{_infodir}/%{name}*
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xzgv.xpm
 
 %changelog
+* Sat Dec  5 2009 Terje Rosten <terjeros at phys.ntnu.no> - 0.9.1-1
+- 0.9.1
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 18 2009 Hans de Goede <hdegoede at redhat.com> - 0.9-7
+- Add an icon for the menu entry
+- Make ChangeLog and NEWS UTF-8
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xzgv-0.9-svn-r41.patch DELETED ---