remove rpm dependencies; make spec file with version suffix work

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9083 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index a3030ba6dbae5e5b3fb4e6c72a6b498f9f8e909c..c15de569e5f31ad01a3f72ffde639ab70f2b840e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * configure.ac: remove RPM_FRONTEND_DEPS
+
 2004-10-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * configure.ac: make maintainer mode active by default for

diff --git a/config/ChangeLog b/config/ChangeLog
index 8993ad405fe1269568062baa7b54deab649ec5cb..c70bf4780d36f0951e156ea117e91893a587f609 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * lyxinclude.m4: set new variable RPM_VERSION_SUFFIX
+
 2004-10-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * lyxinclude.m4 (LYX_CHECK_VERSION): simplify

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b2aa950555bcaefae49ae320322322b4422868e5..96958edaee04b9f770d41e0dce3fe078470755e1 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -37,8 +37,10 @@ AC_ARG_WITH(version-suffix,
      ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
    fi
    lyxname="lyx$withval"
-   program_suffix=$withval],
+   program_suffix=$withval
+   RPM_VERSION_SUFFIX="--with-version-suffix=$withval"],
   [lyxname=lyx])
+AC_SUBST(RPM_VERSION_SUFFIX)
 AC_MSG_RESULT([$lyxname])
 ])
 

diff --git a/configure.ac b/configure.ac
index ed6b0acb1411ef4005e3f6a0be5fffbe13f0c5b1..fa631bb063f1987ec85b702ac59c0a899769344c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,6 @@ for frontend in $FRONTENDS ; do
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
-         RPM_FRONTEND_DEPS='libforms >= 1.0'
          FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
       libXpm version:\t\t${XPM_VERSION}\n\
@@ -200,7 +199,6 @@ for frontend in $FRONTENDS ; do
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
          RPM_FRONTEND="gtk"
-         RPM_FRONTEND_DEPS='gtkmm >= 2.4.0'
          GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
          LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
          FRONTEND_INFO="${FRONTEND_INFO}\
@@ -214,7 +212,6 @@ for frontend in $FRONTENDS ; do
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
          RPM_FRONTEND="qt"
-         RPM_FRONTEND_DEPS='qt >= 2.2.1'
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
       Qt version:\t\t${QT_VERSION}\n"
@@ -319,7 +316,6 @@ ${FRONTEND_INFO}\
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
 
 ## Some config.h stuff
 

diff --git a/development/ChangeLog b/development/ChangeLog
index 2e72df1006415644509da61f4aa44c79cccd9c3d..148cce032972cef20e3fa466c75bd142e42249ae 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * lyx.spec.in: fix spec file if it is generated by
+       configure --with-version-suffix
+       * lyx.spec.in: remove dependencies
+
 2004-10-10  José Matos  <jamatos@lyx.org>
 
        * FORMAT: document change to format 237.

diff --git a/development/lyx.spec.in b/development/lyx.spec.in
index 294fc87a85fb6a0f5a50a25bc2aa94e7711d0e18..2e3c1fdbe52501dd5f58b6a458078c344e7defa0 100644 (file)
--- a/development/lyx.spec.in
+++ b/development/lyx.spec.in
@@ -1,5 +1,5 @@
 %define frontend @RPM_FRONTEND@
-%define frontdep @RPM_FRONTEND_DEPS@
+%define version_suffix @RPM_VERSION_SUFFIX@
 
 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
 Name: @PACKAGE@
@@ -13,7 +13,6 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Icon: %{name}.xpm
 Prefix: %{_prefix}
-Requires: %{frontdep}, tetex-xdvi, tetex, tetex-latex
 Obsoletes: tetex-lyx
 
 %description
@@ -42,7 +41,8 @@ This is LyX built with the %{frontend} frontend.
 unset LINGUAS || true
 ./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
        --mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
-       --without-warnings --disable-debug --enable-optimization=-O2
+       --without-warnings --disable-debug --enable-optimization=-O2 \
+       %{version_suffix}
 make
 
 %install
@@ -63,7 +63,8 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
 #
 # Miscellaneous files
 #
-cp -a lib/images/%{name}.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
+# Don't use %{name}.xpm, this will not work with --version-suffix
+cp -a lib/images/lyx.xpm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/images/
 cp lib/reLyX/README README.reLyX
 
 %clean