rpms/lyx/EL-5 lyx.spec,1.50,1.51

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164

Modified Files:
	lyx.spec 
Log Message:
* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
- License: GPLv2+
- EPEL: drop aiksaurus support (until aiksaurus is available)



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/EL-5/lyx.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- lyx.spec	10 Sep 2007 17:01:29 -0000	1.50
+++ lyx.spec	12 Sep 2007 15:55:13 -0000	1.51
@@ -1,10 +1,14 @@
 
+%if 0%{?fedora} > 3
+%define _with_aiksaurus --with-aiksaurus
+%endif
+
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-License: GPL
+License: GPLv2+
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
 Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
@@ -25,14 +29,13 @@
 # xforms frontend
 BuildRequires: xforms-devel
 
+%{?_with_aiksaurus:BuildRequires: aiksaurus-devel}
+BuildRequires: aspell-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: python
-BuildRequires: aiksaurus-devel
-BuildRequires: aspell-devel
+BuildRequires: tetex-fonts tetex-latex
 BuildRequires: zlib-devel
-BuildRequires: tetex-latex
-BuildRequires: tetex-fonts
 
 # For texhash
 Requires(post): tetex-fonts
@@ -43,8 +46,6 @@
 Requires: tetex-dvips
 Requires: mathml-fonts
 Requires: ghostscript
-# Short-hand for Requires+Requires(post,postun)
-Prereq: xdg-utils
 ## Soft dependencies
 %if 0%{?fedora} > 3
 # dvipost adds support for lyx's Document->Change Tracking feature
@@ -53,6 +54,7 @@
 %endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
+Requires(hint): xdg-utils
 
 %description
 LyX is a modern approach to writing documents which breaks with the
@@ -112,7 +114,7 @@
   --enable-compression-support \
   --with-frontend="qt xforms" \
   --enable-optimization="%{optflags}" \
-  --with-aiksaurus \
+  %{?_with_aiksaurus} %{!?_with_aiksaurus:--without-aiksaurus} \
   --with-aspell \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
@@ -162,15 +164,18 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure.py  > /dev/null 2>&1 ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 texhash > /dev/null 2>&1 ||:
+fi
 
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing, 
@@ -217,6 +222,10 @@
 
 
 %changelog
+* Mon Sep 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-2
+- License: GPLv2+
+- EPEL: drop aiksaurus support (until aiksaurus is available)
+
 * Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
 - lyx-1.4.5.1