rpms/lyx/FC-5 lyx.spec,1.33,1.34

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826

Modified Files:
	lyx.spec 
Log Message:
* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-4
- add generic app icon (rh #191944)



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lyx.spec	13 May 2006 17:18:57 -0000	1.33
+++ lyx.spec	16 May 2006 16:56:20 -0000	1.34
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -142,21 +142,29 @@
 mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
    $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
-   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-   --add-category "X-Fedora" \
-   %{SOURCE21} %{SOURCE22}
+# .desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category="X-Fedora" --vendor="fedora" \
+  %{SOURCE21} %{SOURCE22}
+
+# generic/hicolor icon
+install -p -D -m644 lib/images/lyx.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm
 
 %find_lang %{name} || touch %{name}.lang
 
 
 %post
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 texhash > /dev/null 2>&1 ||:
 cd %{_datadir}/lyx && ./configure  > /dev/null 2>&1 ||:
 
 %postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 texhash > /dev/null 2>&1 ||:
 
@@ -183,6 +191,7 @@
 %{_bindir}/lyxclient
 %{_bindir}/tex2lyx
 %{_mandir}/man1/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/lyx/
 %{_datadir}/texmf/tex/latex/lyx/
 %verify(not md5 size mtime) %{_datadir}/lyx/*.lst
@@ -201,6 +210,9 @@
 
 
 %changelog
+* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-4
+- add generic app icon (rh #191944)
+
 * Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-3
 - Requires(hint): tetex-dvipost
   adds support for lyx's Document->Change Tracking