rpms/gqview/devel gqview-1.4.4-mimetype.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 gqview.spec, 1.1, 1.2 sources, 1.2, 1.3 gqview-configure.in-xinerama.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

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

Modified Files:
	.cvsignore gqview.spec sources 
Added Files:
	gqview-1.4.4-mimetype.patch 
Removed Files:
	gqview-configure.in-xinerama.patch 
Log Message:
Import approved gqview-1.4.4-0.fdr.2.src.rpm from fedora.us bug 2084.

gqview-1.4.4-mimetype.patch:

--- NEW FILE gqview-1.4.4-mimetype.patch ---
diff -Nur gqview-1.4.4-orig/gqview.desktop gqview-1.4.4/gqview.desktop
--- gqview-1.4.4-orig/gqview.desktop	2004-03-01 21:45:33.000000000 +0100
+++ gqview-1.4.4/gqview.desktop	2004-09-25 14:29:06.380678632 +0200
@@ -10,6 +10,7 @@
 Exec=gqview
 Icon=gqview.png
 Type=Application
+MimeType=image/jpeg;image/gif;image/png;image/x-png;image/xpm;image/bmp;image/x-bmp;image/tiff;image/x-ico;image/x-pcx;image/x-tga;image/vnd.wap.wbmp;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/vnd.wap.wbmp;
 Terminal=false
 StartupNotify=false
 StartupWMClass=gqview


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2004 21:40:22 -0000	1.1
+++ .cvsignore	26 Nov 2004 09:11:35 -0000	1.2
@@ -0,0 +1 @@
+gqview-1.4.4.tar.gz


Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gqview.spec	26 Nov 2004 09:06:44 -0000	1.1
+++ gqview.spec	26 Nov 2004 09:11:35 -0000	1.2
@@ -1,46 +1,50 @@
-Summary: 	Image browser and viewer.
+Summary: 	Image browser and viewer
 Name: 		gqview
-Version: 	1.4.1
-Release: 	2
+Version: 	1.4.4
+Release:	0.fdr.2
 License: 	GPL
 Group: 		User Interface/X
-Source: 	http://download.sourceforge.net/sourceforge/gqview/gqview-1.4.1.tar.gz
-Patch0:		gqview-configure.in-xinerama.patch
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
+Source: 	http://dl.sf.net/sourceforge/gqview/gqview-1.4.4.tar.gz
+Patch1:		gqview-1.4.4-mimetype.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: 		http://gqview.sourceforge.net/
-BuildRequires: 	libpng-devel gtk2-devel gnome-libs-devel
+BuildRequires: 	libpng-devel gtk2-devel
 BuildRequires: 	gettext desktop-file-utils
-# We patch configure.in...
-BuildRequires:	autoconf
+Requires(post): desktop-file-utils
 
 %description
 GQview is an image viewer for browsing through graphics files. GQview
 features include single click file viewing, support for external
 editors, previewing images using thumbnails, and zoom.
 
-Install GQview if you need an image viewer.
 
 %prep
 %setup -q
-%patch0 -p0 
-autoconf
+%patch1 -p1 -b .mimetype
+sed -i 's!^#define.*GQVIEW_HELPDIR.*!#define GQVIEW_HELPDIR "%{_docdir}/%{name}-%{version}"!' configure
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall GNOME_DATADIR=$RPM_BUILD_ROOT%{_datadir}
+%makeinstall
 
+# should be '--vendor fedora', but that would break upgrades for
+# people who have linked the desktop icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
 	--delete-original \
 	--vendor gnome \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category "Application;Graphics;X-Red-Hat-Extra" \
-	$RPM_BUILD_ROOT%{_datadir}/gnome/apps/Graphics/gqview.desktop
+	--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
@@ -50,18 +54,38 @@
 
 %find_lang %name
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+update-desktop-database %{_datadir}/applications
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING
+%doc README COPYING AUTHORS
 %{_bindir}/gqview
 %{_mandir}/man1/gqview.1*
 %{_datadir}/pixmaps/gqview.png
 %{_datadir}/applications/*gqview.desktop
 
+
 %changelog
+* Sat Sep 25 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.4.4-0.fdr.2
+- fix Help menu
+- add MIME types and run update-desktop-database
+- drop wrong BR gnome-libs-devel (Adrian Reber, fedora.us #2084)
+
+* Tue Sep 21 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.4.4-0.fdr.1
+- adapt fc2.90 package 1.4.1-3, upgrade to 1.4.4
+- xinerama configure check patch is obsolete
+- minor spec changes
+
+* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
+- rebuilt
+
 * Tue Mar 16 2004 Warren Togami <wtogami at redhat.com> 1.4.1-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2004 09:06:44 -0000	1.2
+++ sources	26 Nov 2004 09:11:35 -0000	1.3
@@ -1 +1 @@
-d963fbb878d78e8ebf78ea8c18caa72f  gqview-1.4.1.tar.gz
+b3f1e1ca830c9cc0b484966fac9e6f28  gqview-1.4.4.tar.gz


--- gqview-configure.in-xinerama.patch DELETED ---