rpms/gqview/devel gqview.spec,1.20,1.21

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	gqview.spec 
Log Message:
* Thu May  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-7
- scriptlets: run update-desktop-database without path
- drop dependency on desktop-file-utils
- update spec file with more dir macros
- include GQ_HELPDIR and GQ_HTMLDIR via _docdir



Index: gqview.spec
===================================================================
RCS file: /cvs/extras/rpms/gqview/devel/gqview.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gqview.spec	8 Feb 2008 21:38:15 -0000	1.20
+++ gqview.spec	8 May 2008 08:49:34 -0000	1.21
@@ -1,19 +1,17 @@
-Summary:	Image browser and viewer
-Name:		gqview
-Version:	2.0.4
-Release: 6
-License:	GPLv2
-Group:		User Interface/X
-Source:		http://dl.sf.net/sourceforge/gqview/gqview-%{version}.tar.gz
-Patch1:		gqview-2.0.3-desktop.patch
-Patch2:		gqview-2.0.4-editors.patch
-Patch3:     gqview-2.0.4-print-pagesize.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-URL:		http://gqview.sourceforge.net/
-BuildRequires:	gtk2-devel >= 2.4.0
-BuildRequires:	gettext desktop-file-utils
-Requires(post):		desktop-file-utils
-Requires(postun):	desktop-file-utils
+Summary: Image browser and viewer
+Name: gqview
+Version: 2.0.4
+Release: 7
+License: GPLv2
+Group: User Interface/X
+Source: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch1: gqview-2.0.3-desktop.patch
+Patch2: gqview-2.0.4-editors.patch
+Patch3: gqview-2.0.4-print-pagesize.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+URL: http://gqview.sourceforge.net/
+BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: gettext desktop-file-utils
 
 %description
 GQview is an image viewer for browsing through graphics files. GQview
@@ -30,6 +28,9 @@
 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
 
+cp -a ChangeLog ChangeLog.orig
+iconv -f ISO-8859-1 -t UTF-8 ChangeLog.orig > ChangeLog
+
 
 %build
 %configure
@@ -38,19 +39,21 @@
 
 %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
+make DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" install
+
+# Installed automatically:
+# We want these _docdir files in GQ_HELPDIR.
+#install -p -m 0644 ChangeLog COPYING README TODO \
+#    ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 
 # should be '--vendor fedora', but that would break upgrades for
 # people who have linked the desktop icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+[ ! -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop ] && exit 1
 desktop-file-install \
 	--delete-original \
 	--vendor gnome \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category "X-Fedora" \
-	$RPM_BUILD_ROOT%{_datadir}/applications/gqview.desktop
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %find_lang %name
 
@@ -60,24 +63,29 @@
 
 
 %post
-update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %postun
-update-desktop-database %{_datadir}/applications &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README COPYING TODO ChangeLog
-%doc .doc.tmp/html
-%{_bindir}/gqview
-%{_mandir}/man1/gqview.1*
-%{_datadir}/pixmaps/gqview.png
-%{_datadir}/applications/*gqview.desktop
+%doc %{_docdir}/%{name}*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/gnome-%{name}.desktop
 
 
 %changelog
+* Thu May  8 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-7
+- scriptlets: run update-desktop-database without path
+- drop dependency on desktop-file-utils
+- update spec file with more dir macros
+- include GQ_HELPDIR and GQ_HTMLDIR via _docdir
+
 * Fri Feb 08 2008 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering