rpms/xca/F-7 xca.spec,1.18,1.19

[Enrico Scholz (ensc)]

Author: ensc

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

Modified Files:
	xca.spec 
Log Message:
- improved desktop-integration by registering MIME type and icons
- disabled ppc64 build (bz #246324)




Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/F-7/xca.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xca.spec	15 Jun 2007 07:10:07 -0000	1.18
+++ xca.spec	30 Jun 2007 12:01:21 -0000	1.19
@@ -5,21 +5,27 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.6.3
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
 Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
 Source1:	README.update
+Source4:	xca.xml
 Patch0:		xca-0.6.3-locale.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	db4-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:	xdg-utils
 BuildRequires:	ImageMagick
 BuildRequires:	linuxdoc-tools
+Requires:		hicolor-icon-theme
+Requires(post):		shared-mime-info
+Requires(postun):	shared-mime-info
 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=246324
+ExcludeArch:		ppc64
 
 %description
 The Program uses a Berkeley db for storage and supports RSA keys.
@@ -41,6 +47,8 @@
 
 install -p -m644 %SOURCE1 '.'
 
+sed -i -e 's!xca\.xpm!fedora-xca!g;s!^Exec=.*!\0 %f!' misc/xca.desktop
+
 
 %build
 #test -n "$QTDIR" || . %_sysconfdir/profile.d/qt.sh
@@ -50,6 +58,7 @@
 make %{?_smp_mflags}
 
 convert img/xca.ico xca.png
+convert img/xdb.ico xdb.png
 
 
 %install
@@ -61,13 +70,21 @@
 # HACK: check whether workarounds below are still necessary
 test ! -e $RPM_BUILD_ROOT%_datadir/xca/crl.png
 
-install -d -m755           $RPM_BUILD_ROOT%_datadir/{applications,pixmaps}
+install -d -m755           $RPM_BUILD_ROOT%_datadir/{applications,mime/packages,icons/hicolor}
 install -p -m644 img/*.png $RPM_BUILD_ROOT%_datadir/xca
-install -p -m644 xca.png   $RPM_BUILD_ROOT%_datadir/pixmaps/
+install -p -m644 %SOURCE4  $RPM_BUILD_ROOT%_datadir/mime/packages/
+
+export XDG_DATA_DIRS=$RPM_BUILD_ROOT%_datadir
+export XDG_UTILS_INSTALL_MODE=system
+
+xdg-icon-resource install --noupdate --context mimetypes --size 32 xdb.png application-x-xca-database
+xdg-icon-resource install --noupdate                     --size 32 xca.png fedora-xca
 
 desktop-file-install --vendor fedora --mode 0644		\
   --dir $RPM_BUILD_ROOT%_datadir/applications			\
   --delete-original						\
+  --add-mime-type application/x-xca-database			\
+  --remove-category QT						\
   $RPM_BUILD_ROOT%_datadir/applications/xca.desktop
 
 
@@ -75,6 +92,17 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 
+%post
+update-mime-database %_datadir/mime || :
+xdg-desktop-menu     forceupdate &>/dev/null || :
+xdg-icon-resource    forceupdate &>/dev/null || :
+
+%postun
+xdg-icon-resource    forceupdate &>/dev/null || :
+xdg-desktop-menu     forceupdate &>/dev/null || :
+update-mime-database %_datadir/mime || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYRIGHT README.update
@@ -85,7 +113,8 @@
 %_datadir/xca/*.txt
 %_datadir/xca/*.html
 %_datadir/xca/*.xca
-%_datadir/pixmaps/*.png
+%_datadir/icons/*/*/*/*.png
+%_datadir/mime/packages/%name.*
 %lang(de) %_datadir/xca/xca_de.qm
 %lang(es) %_datadir/xca/xca_es.qm
 
@@ -93,6 +122,10 @@
 
 
 %changelog
+* Sat Jun 30 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.3-2
+- improved desktop-integration by registering MIME type and icons
+- disabled ppc64 build (bz #246324)
+
 * Thu Jun 14 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.3-1
 - updated to 0.6.3; rediffed patches
 - fixed build