>>>>> "Georg" == Georg Baum <[EMAIL PROTECTED]> writes:
Georg> This is fine with me. In the debian world, we would downgrade
Georg> the dependency to "Recommends" or even "Suggests", but AFAIK
Georg> rpm does not offer this flexibility.
That would be nice indeed.
>> The same holds for qt: what about dropping the dependency?
Georg> Also fine with me, because rpm produces a dependency on the
Georg> shared libraries automatically. The last time I proposed this I
Georg> got the answer that we want the version information ;-( Am
Georg> additional benefit of removing the frontend specific
Georg> dependencies is that a spec file that was produced by a
Georg> multiple frontend configure run works again (this is of course
Georg> a 1.4 problem).
Here is a simple untested patch against 1.3.5cvs to remove
dependencies. I would appreciate if it could be tested on all the
different rpm based distributions.
JMarc
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.86.2.25
diff -u -p -r1.86.2.25 ChangeLog
--- config/ChangeLog 1 Mar 2004 14:50:29 -0000 1.86.2.25
+++ config/ChangeLog 29 Sep 2004 14:25:01 -0000
@@ -1,3 +1,8 @@
+2004-09-29 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * configure.in:
+ * configure.ac: remove variable RPM_FRONTEND_DEPS
+
2004-03-01 Zvezdan Petkovic <[EMAIL PROTECTED]>
* qt.m4 (QT_DO_IT_ALL): if the variables MOC or UIC are set, honor
Index: config/configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/Attic/configure.ac,v
retrieving revision 1.24.2.20
diff -u -p -r1.24.2.20 configure.ac
--- config/configure.ac 19 Feb 2004 12:02:16 -0000 1.24.2.20
+++ config/configure.ac 29 Sep 2004 14:25:01 -0000
@@ -173,8 +173,7 @@ case "$lyx_use_frontend" in
LYX_PATH_XFORMS
LYX_CHECK_XFORMS_IMAGE_LOADER
FRONTEND="xforms"
- RPM_FRONTEND="xforms"
- RPM_FRONTEND_DEPS='libforms >= 1.0'
+ RPM_FRONTEND="xforms"
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
@@ -198,7 +197,6 @@ 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)"
@@ -284,7 +282,6 @@ ${FRONTEND_INFO}\
AC_SUBST(VERSION_INFO)
AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
## Some config.h stuff
Index: config/configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/Attic/configure.in,v
retrieving revision 1.17.2.20
diff -u -p -r1.17.2.20 configure.in
--- config/configure.in 19 Feb 2004 12:02:16 -0000 1.17.2.20
+++ config/configure.in 29 Sep 2004 14:25:01 -0000
@@ -178,8 +178,7 @@ case "$lyx_use_frontend" in
LYX_PATH_XFORMS
LYX_CHECK_XFORMS_IMAGE_LOADER
FRONTEND="xforms"
- RPM_FRONTEND="xforms"
- RPM_FRONTEND_DEPS='libforms >= 1.0'
+ RPM_FRONTEND="xforms"
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
@@ -205,7 +204,6 @@ dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS
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)"
@@ -292,7 +290,6 @@ ${FRONTEND_INFO}\
AC_SUBST(VERSION_INFO)
AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
Index: development/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/development/ChangeLog,v
retrieving revision 1.27.2.4
diff -u -p -r1.27.2.4 ChangeLog
--- development/ChangeLog 7 Nov 2003 15:12:18 -0000 1.27.2.4
+++ development/ChangeLog 29 Sep 2004 14:25:01 -0000
@@ -1,3 +1,7 @@
+2004-09-29 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * lyx.spec.in: remove dependencies
+
2003-11-07 Ronald Florence <[EMAIL PROTECTED]>
* MacOSX/qt.patch: small tweak for Panther
Index: development/lyx.spec.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.18.2.1
diff -u -p -r1.18.2.1 lyx.spec.in
--- development/lyx.spec.in 25 Feb 2003 15:06:11 -0000 1.18.2.1
+++ development/lyx.spec.in 29 Sep 2004 14:25:01 -0000
@@ -1,5 +1,4 @@
%define frontend @RPM_FRONTEND@
-%define frontdep @RPM_FRONTEND_DEPS@
Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
Name: @PACKAGE@
@@ -13,7 +12,6 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Icon: %{name}.xpm
Prefix: %{_prefix}
-Requires: %{frontdep}, tetex-xdvi, tetex, tetex-latex
Obsoletes: tetex-lyx
%description
