rpms/lyx/devel lyx.spec,1.91,1.92

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4920

Modified Files:
	lyx.spec 
Log Message:
* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.2-2
- scriptlet optimization



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- lyx.spec	16 Mar 2009 16:56:54 -0000	1.91
+++ lyx.spec	23 Mar 2009 18:09:51 -0000	1.92
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -37,9 +37,6 @@
 Provides:  %{name}-qt = %{version}-%{release}
 Obsoletes: %{name}-xforms < 1.5.0 
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
 Requires(post): texlive
@@ -121,9 +118,8 @@
    %{buildroot}${texmf}/tex/latex/lyx
 
 # .desktop
-desktop-file-install \
-  --dir %{buildroot}%{_datadir}/applications \
-  --vendor="" \
+desktop-file-install --vendor="" \
+  --dir="%{buildroot}%{_datadir}/applications" \
   %{SOURCE10}
 
 # icon
@@ -142,17 +138,21 @@
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-texhash > /dev/null 2>&1 ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-if [ $1 -eq 0 ]; then
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-texhash > /dev/null 2>&1 ||:
+if [ $1 -eq 0 ] ; then
+    texhash >& /dev/null 
+    update-desktop-database -q &> /dev/null
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
+%posttrans
+texhash >& /dev/null
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing,
 ##   and besides, we use xdg-open now -- Rex
@@ -187,6 +187,9 @@
 
 
 %changelog
+* Mon Mar 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.2-2
+- scriptlet optimization
+
 * Sun Mar 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.2-1
 - lyx-1.6.2
 - use --without-included-boost unconditionally