rpms/lyx/devel lyx.spec,1.94,1.95

[Rex Dieter]

Author: rdieter

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

Modified Files:
	lyx.spec 
Log Message:
sync changes from EL-5 branch



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- lyx.spec	4 Jun 2009 16:55:31 -0000	1.94
+++ lyx.spec	23 Jun 2009 03:24:07 -0000	1.95
@@ -1,4 +1,7 @@
 
+%if 0%{fedora} > 3
+%define _with_aiksaurus --with-aiksaurus
+%endif
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
@@ -19,7 +22,9 @@ Source1: lyxrc.dist
 
 Source10: lyx.desktop
 
+%if 0%{?_with_aiksaurus:1}
 BuildRequires: aiksaurus-devel
+%endif
 BuildRequires: aspell-devel
 %if 0%{?_without_included_boost:1}
 BuildRequires: boost-devel
@@ -96,8 +101,9 @@ and let the computer take care of the re
   --disable-rpath \
   --enable-build-type=release \
   --enable-optimization="%{optflags}" \
-  --with-aiksaurus \
   --with-aspell \
+  --with-qt4-dir=`pkg-config --variable=prefix QtCore` \
+  %{?_with_aiksaurus} \
   %{?_without_included_boost}
 
 make %{?_smp_mflags}
@@ -137,15 +143,19 @@ rm -rf %{buildroot}%{_datadir}/lyx/fonts
 %find_lang %{name}
 
 
+%check
+make check
+
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 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 || :
+  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