improved lyx.spec from Kayvan

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6254 a592a061-630c-0410-9148-cb99ea01b6c8

config/ChangeLog

@@ -1,3 +1,9 @@
+2003-02-20  Kayvan A. Sylvan <kayvan@sylvan.com>
+
+	* configure.ac, configure.in: add RPM_FRONTEND stuff to
+	automatically generate an xforms or qt specific lyx.spec
+	file.
+
 2003-02-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* Makefile.am (EXTRA_DIST): add pkg.m4, relyx_configure.ac and

config/configure.ac

@@ -156,6 +156,8 @@ case "$lyx_use_frontend" in
 	LYX_PATH_XFORMS
 	LYX_CHECK_XFORMS_IMAGE_LOADER
 	FRONTEND="xforms"
+        RPM_FRONTEND="xforms"
+        RPM_FRONTEND_DEPS='libforms >= 1.0'
 	FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
 	FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
 	case "$host" in
@@ -185,6 +187,8 @@ dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
 dnl	;;
   qt)
     QT_DO_IT_ALL
+    RPM_FRONTEND="qt"
+    RPM_FRONTEND_DEPS='qt >= 2.2.1'
     FRONTEND="qt2"
     FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
     FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
@@ -382,6 +386,10 @@ AC_CONFIG_FILES([Makefile \
        src/frontends/qt2/ui/moc/Makefile \
        src/frontends/gnome/Makefile \
 ])
+
+AC_SUBST(RPM_FRONTEND, 'xforms')
+AC_SUBST(RPM_FRONTEND_DEPS, 'libforms >= 1.0')
+
 AC_OUTPUT
 # show version information
 echo

config/configure.in

@@ -159,6 +159,8 @@ case "$lyx_use_frontend" in
 	LYX_PATH_XFORMS
 	LYX_CHECK_XFORMS_IMAGE_LOADER
 	FRONTEND="xforms"
+        RPM_FRONTEND="xforms"
+        RPM_FRONTEND_DEPS='libforms >= 1.0'
 	FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
 	FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
 	case "$host" in
@@ -190,6 +192,8 @@ dnl     FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTE
 dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
   qt)
     QT_DO_IT_ALL
+    RPM_FRONTEND="qt"
+    RPM_FRONTEND_DEPS='qt >= 2.2.1'
     FRONTEND="qt2"
     FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
     FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
@@ -283,6 +287,8 @@ ${FRONTEND_INFO}\
 
 
 AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND, 'xforms')
+AC_SUBST(RPM_FRONTEND_DEPS, 'libforms >= 1.0')
 
 ### Finish the work.
 AC_CONFIG_SUBDIRS(lib lib/reLyX)

development/lyx.spec.in

@@ -1,16 +1,19 @@
+%define frontend @RPM_FRONTEND@
+%define frontdep @RPM_FRONTEND_DEPS@
+
 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: @PACKAGE@
 Version: @VERSION@
-Release: 1
+Release: 1_%{frontend}
 Copyright: see COPYING file
-Group: X11/Editors
+Group: Applications/Publishing
-Url: http://www.lyx.org/
+URL: http://www.lyx.org/
 Packager: Kayvan A. Sylvan <kayvan@sylvan.com>
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{PACKAGE_VERSION}.tar.gz
+Source: ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Icon: lyx.xpm
+Icon: %{name}.xpm
-Prefix: /usr
+Prefix: %{_prefix}
-Requires: xforms >= 0.89, tetex-xdvi, tetex, tetex-latex
+Requires: %{frontdep}, tetex-xdvi, tetex, tetex-latex
 Obsoletes: tetex-lyx
 
 %description
@@ -30,14 +33,16 @@ to the backends (like LaTeX) that are specifically designed for the task.
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
+This is LyX built with the %{frontend} frontend.
+
 %prep
 %setup
 
 %build
 unset LINGUAS || true
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
-	--bindir=%{_bindir} --datadir=%{_datadir} \
+	--mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
-	--without-warnings --disable-debug --enable-optimization=-O2
+ 	--without-warnings --disable-debug --enable-optimization=-O2
 make
 
 %install
@@ -52,13 +57,13 @@ gzip -f9 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
 #
 TEXMF=%{_datadir}/texmf
 mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex
-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
+mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
-      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/lyx
+      ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/%{name}
 
 #
 # Miscellaneous files
 #
-cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/lyx/images/
+cp -a lib/images/%{name}.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
 cp lib/reLyX/README README.reLyX
 
 %clean
@@ -77,14 +82,13 @@ fi
 # Now configure LyX
 #
 echo "Configuring LyX for your system..."
-cd %{_datadir}/lyx
+cd %{_datadir}/%{name}
 ./configure --srcdir
 
 # Fix reLyX perl program if the prefix is non-standard
 if [ "%{_prefix}" != "/usr" ]
 then
-    perl -pi -e "s!/usr/share/lyx!%{_datadir}/lyx!" \
+    perl -pi -e "s!/usr/share/%{name}!%{_datadir}/%{name}!" %{_bindir}/reLyX
-        %{_bindir}/reLyX
 fi
 
 %postun

status.13x

@@ -72,7 +72,7 @@ What's new
 
 - fix some dialogs to make OK the default button [bug #921, Qt only]
 
-- fix various problems with paper size selection [bug #844 and more]
+- fix various problems with paper size selection [bug #844 and #866]
 
 - duplicate 'a' shortcut in graphics dialog fixed [XForms only]
 
@@ -99,3 +99,6 @@ What's new
 
 - add a few autoconf-related files that were missing from the
   distribution 
+
+- improve the lyx.spec file used to produce rpms
+