rpms/lyx/devel find_helpers.sh,NONE,1.1 lyx.spec,1.13,1.14

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx.spec 
Added Files:
	find_helpers.sh 
Log Message:
* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
- leave out kde-redhat bits in Fedora Extras build
- define/use safer (esp for x86_64) QTDIR bits



***** Error reading new file: [Errno 2] No such file or directory: 'find_helpers.sh'

Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lyx.spec	23 Aug 2005 15:13:09 -0000	1.13
+++ lyx.spec	2 Sep 2005 12:16:21 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.6
-Release: 4%{?dist}
+Release: 4%{?dist}%{?kde}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -16,6 +16,10 @@
 # "borrow" kde's crystal icon for lyx
 Source2: lyx-crystal.png
 
+# TODO: use this find_helpers.sh script at runtime, instead of depending on
+# lyx's configure and %%triggers
+Source10: find_helpers.sh
+
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
@@ -35,8 +39,11 @@
 Requires: htmlview
 
 BuildRequires: qt-devel >= 1:3.3
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
+%if "%{?kde}" != "%{nil}"
+# kde-redhat crud, not needed in Fedora Extras
+%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
 Requires: qt >= 1:%{qt_ver}
+%endif
 
 
 %description
@@ -65,8 +72,10 @@
 
 
 %build
-unset LINGUAS ||: 
-unset QTDIR ||: ; . /etc/profile.d/qt.sh
+test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
+
+unset LINGUAS ||:
 
 %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
 
@@ -95,7 +104,7 @@
 mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
    ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
 
-# KDE has a nice builtin crystalsvg icon, but this is for gnome's benefit
+# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit
 install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -152,7 +161,11 @@
 
 
 %changelog 
-* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
+* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
+- leave out kde-redhat bits in Fedora Extras build
+- define/use safer (esp for x86_64) QTDIR bits
+
+* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-3
 - touchup helpers script
 - fix for (sometimes missing) PSres.upr