rpms/xfig/devel xfig.desktop,1.4,1.5 xfig.spec,1.45,1.46

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	xfig.desktop xfig.spec 
Log Message:
* Fri Nov 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.5-5
- Also compile a version against Xaw3d instead of plain Xaw, available in the
  new xfig-Xaw3d package
- Various specfile cleanups for packaging guidelines compliance
- Remove spurious executable permissions on various files (bz 247424)
- Apply patch fixing problems with xfig not finding fonts (bz 210278)



Index: xfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfig.desktop	24 Sep 2004 23:16:59 -0000	1.4
+++ xfig.desktop	16 Nov 2007 20:56:21 -0000	1.5
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Categories=Application;Graphics;X-Red-Hat-Extra;
-X-Desktop-File-Install-Version=0.2
+Categories=Graphics;
 MimeType=image/fig;image/x-xfig;
 Exec=xfig
 Icon=xfig
@@ -17,7 +16,7 @@
 Comment[cs]=Aplikace pro kreslení vektorových obrázků
 Comment[da]=Xfig tegneprogram
 Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Εφαρμογή ζωγραφικής Xfig
+Comment[el]=Xfig
 Comment[eo]=Desegnilo "Xfig"
 Comment[es]=Aplicación de diseño vectorial (objetos)
 Comment[et]=XFig joonistusprogramm
@@ -44,5 +43,5 @@
 Comment[sv]=Xfig ritprogram
 Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
 Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Програма для утворення зображень Xfig
+Comment[uk]=Xfig
 Comment[zh_CN.GB2312]=Xfig 绘图应用程序


Index: xfig.spec
===================================================================
RCS file: /cvs/extras/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xfig.spec	16 Nov 2007 19:58:04 -0000	1.45
+++ xfig.spec	16 Nov 2007 20:56:21 -0000	1.46
@@ -35,6 +35,7 @@
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
 BuildRequires: Xaw3d-devel
+BuildRequires: desktop-file-utils
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -90,7 +91,7 @@
 %patch12 -p1 -b .quiet
 %patch13 -p1 -b .urw
 ln -nfs Doc/xfig.man xfig.man
-chmod -x `find -type f`
+find -type f -print0 | xargs -0 chmod -x
 rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
 sed -i 's/\r//g' Doc/html/index.html
 for i in Doc/html/{new_features,new_features.3.2.4,bugs_fixed.3.2.4}.html; do
@@ -124,11 +125,14 @@
 install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 install -m 755 %{name}-Xaw3d %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}%{_datadir}/pixmaps \
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps \
          %{buildroot}%{_datadir}/applications
 
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
-install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/net-xfig.desktop
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+
+desktop-file-install --vendor fedora         \
+  --dir %{buildroot}%{_datadir}/applications \
+  %{SOURCE2}
 
 # remove app-defaults symlink which gets installed
 rm %{buildroot}%{_prefix}/lib*/X11/app-defaults
@@ -138,6 +142,21 @@
 rm -rf %{buildroot}
 
 
+%post common
+update-desktop-database &> /dev/null || :
+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 common
+update-desktop-database &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/%{name}-plain
@@ -152,9 +171,9 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/*/*
-%{_datadir}/pixmaps/%{name}.png
 %{app_defaults_dir}/*
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog