rpms/lyx/devel helpers.sh,1.1,1.2 lyx.spec,1.30,1.31

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	helpers.sh lyx.spec 
Log Message:
* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
- %trigger ImageMagick (#186319)



Index: helpers.sh
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/helpers.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- helpers.sh	20 Jan 2006 15:37:52 -0000	1.1
+++ helpers.sh	30 Mar 2006 18:42:06 -0000	1.2
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 
 if [ -f /etc/lyx.conf ]; then
  source /etc/helpers.conf


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lyx.spec	9 Mar 2006 16:15:37 -0000	1.30
+++ lyx.spec	30 Mar 2006 18:42:06 -0000	1.31
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -104,26 +104,18 @@
 optflags="$(echo %optflags | sed -e 's|-fexceptions||' )"
 %global optflags $optflags
 
-for frontend in qt xforms ; do
-
 %configure \
   --disable-rpath \
   --enable-compression-support \
-  --with-frontend=$frontend \
+  --with-frontend="qt xforms" \
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
   --without-warnings --disable-dependency-tracking \
-  --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \
-
-# Intermediate cleanup
-# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
-make -C src/frontends clean
+  --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
 make %{?_smp_mflags}
 
-done
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -163,12 +155,12 @@
 texhash > /dev/null 2>&1 ||:
 
 # Catch installed/uninstalled helpers
-%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
+%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: 
 fi
 
-%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv
+%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -203,6 +195,9 @@
 
 
 %changelog
+* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
+- %%trigger ImageMagick (#186319)
+
 * Thu Mar 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-4
 - fix stripping of -fexceptions from %%optflags