rpms/gqview/devel gqview-2.0.0-desktop.patch, NONE, 1.1 gqview-2.0.0-editors.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gqview.spec, 1.3, 1.4 sources, 1.4, 1.5 gqview-1.4.4-mimetype.patch, 1.1, NONE

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Sat Feb 26 23:00:46 UTC 2005 

Author: mschwendt

Update of /cvs/extras/rpms/gqview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7054/devel

Modified Files:
	.cvsignore gqview.spec sources 
Added Files:
	gqview-2.0.0-desktop.patch gqview-2.0.0-editors.patch 
Removed Files:
	gqview-1.4.4-mimetype.patch 
Log Message:
auto-import gqview-2.0.0-1 on branch devel from gqview-2.0.0-1.src.rpm

gqview-2.0.0-desktop.patch:

--- NEW FILE gqview-2.0.0-desktop.patch ---
diff -Nur gqview-2.0.0-orig/gqview.desktop gqview-2.0.0/gqview.desktop
--- gqview-2.0.0-orig/gqview.desktop	2004-11-09 22:41:27.000000000 +0100
+++ gqview-2.0.0/gqview.desktop	2005-02-26 22:14:41.573221328 +0100
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=GQview
-GenericName=Image Viewer
+GenericName=GQview Image Viewer
 GenericName[et]=Piltide vaatur
 GenericName[tr]=Resim göstericisi
 GenericName[fr]=Explorateur d'images
@@ -18,4 +18,4 @@
 #StartupWMClass=gqview
 Encoding=UTF-8
 Categories=Application;Graphics;Viewer;
-MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;
+MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico;image/x-pcx;

gqview-2.0.0-editors.patch:

--- NEW FILE gqview-2.0.0-editors.patch ---
diff -Nur gqview-2.0.0-orig/src/editors.c gqview-2.0.0/src/editors.c
--- gqview-2.0.0-orig/src/editors.c	2004-12-14 16:48:05.000000000 +0100
+++ gqview-2.0.0/src/editors.c	2005-02-26 22:18:47.794673928 +0100
@@ -48,8 +48,8 @@
 
 static gchar *editor_slot_defaults[] = {
 	N_("The Gimp"), "gimp-remote -n %f",
-	N_("XV"), "xv %f",
-	N_("Xpaint"), "xpaint %f",
+	NULL, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Nov 2004 09:15:05 -0000	1.3
+++ .cvsignore	26 Feb 2005 23:00:44 -0000	1.4
@@ -1 +1 @@
-gqview-1.4.5.tar.gz
+gqview-2.0.0.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gqview.spec	26 Nov 2004 09:15:05 -0000	1.3
+++ gqview.spec	26 Feb 2005 23:00:44 -0000	1.4
@@ -1,14 +1,15 @@
 Summary: 	Image browser and viewer
 Name: 		gqview
-Version: 	1.4.5
+Version: 	2.0.0
 Release:	1
 License: 	GPL
 Group: 		User Interface/X
 Source: 	http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
-Patch1:		gqview-1.4.4-mimetype.patch
+Patch1:		gqview-2.0.0-desktop.patch
+Patch2:		gqview-2.0.0-editors.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: 		http://gqview.sourceforge.net/
-BuildRequires: 	libpng-devel gtk2-devel
+BuildRequires: 	gtk2-devel >= 0:2.4.0
 BuildRequires: 	gettext desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -21,8 +22,11 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .mimetype
+%patch1 -p1 -b .desktop
+%patch2 -p1 -b .editors
+# was necessary up to 1.4.5, since 2.0.0 it just adds safety
 sed -i 's!^#define.*GQVIEW_HELPDIR.*!#define GQVIEW_HELPDIR "%{_docdir}/%{name}-%{version}"!' configure
+sed -i 's!^#define.*GQVIEW_HTMLDIR.*!#define GQVIEW_HTMLDIR "%{_docdir}/%{name}-%{version}/html"!' configure
 
 
 %build
@@ -32,8 +36,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
+# make installed documentation accessible to %%doc macro
+rm -rf .doc.tmp ; mv $RPM_BUILD_ROOT%{_prefix}/share/doc/gqview-%{version} .doc.tmp
 
 # should be '--vendor fedora', but that would break upgrades for
 # people who have linked the desktop icon
@@ -42,17 +47,9 @@
 	--delete-original \
 	--vendor gnome \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category "Application" \
-	--add-category "Graphics" \
 	--add-category "X-Fedora" \
 	$RPM_BUILD_ROOT%{_datadir}/applications/gqview.desktop
 
-perl -pi -e 's/Name=GQview/Name=GQview Image Viewer/g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gqview.desktop
-perl -pi -e 's/Comment=Image Viewer/Comment=View and organize images/g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gqview.desktop
-
-# Remove unpackaged file from buildroot
-rm -f $RPM_BUILD_ROOT%{_datadir}/gqview/README
-
 %find_lang %name
 
 
@@ -70,7 +67,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING AUTHORS
+%doc README COPYING TODO ChangeLog
+%doc .doc.tmp/html
 %{_bindir}/gqview
 %{_mandir}/man1/gqview.1*
 %{_datadir}/pixmaps/gqview.png
@@ -78,6 +76,14 @@
 
 
 %changelog
+* Sat Feb 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.0.0-1
+- update to 2.0.0
+- drop BR libpng-devel
+- BR minimum gtk2-devel version
+- create combined mimetype/desktop patch
+- patch out default editors XV/xpaint
+- add new documentation
+
 * Sun Oct 17 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.4.5-1
 - update to 1.4.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Nov 2004 09:15:05 -0000	1.4
+++ sources	26 Feb 2005 23:00:44 -0000	1.5
@@ -1 +1 @@
-b196935767c2d3dc61243d9ed0801c2e  gqview-1.4.5.tar.gz
+421c9a79827e91e394bdfc924071d66f  gqview-2.0.0.tar.gz


--- gqview-1.4.4-mimetype.patch DELETED ---

More information about the scm-commits mailing list