anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove rpm dependencies; make spec file with version suffix work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9083 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2004-10-12 06:41:30 +00:00
parent 541a765905
commit c1d27368a1
6 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2004-10-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac: make maintainer mode active by default for * configure.ac: make maintainer mode active by default for

4
config/ChangeLog
View File

@ -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> 2004-10-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxinclude.m4 (LYX_CHECK_VERSION): simplify * lyxinclude.m4 (LYX_CHECK_VERSION): simplify

4
config/lyxinclude.m4
View File

@ -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,"` ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
fi fi
lyxname="lyx$withval" lyxname="lyx$withval"
program_suffix=$withval], program_suffix=$withval
RPM_VERSION_SUFFIX="--with-version-suffix=$withval"],
[lyxname=lyx]) [lyxname=lyx])
AC_SUBST(RPM_VERSION_SUFFIX)
AC_MSG_RESULT([$lyxname]) AC_MSG_RESULT([$lyxname])
]) ])

4
configure.ac
View File

@ -177,7 +177,6 @@ for frontend in $FRONTENDS ; do
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)" FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms" FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
RPM_FRONTEND="xforms" RPM_FRONTEND="xforms"
RPM_FRONTEND_DEPS='libforms >= 1.0'
FRONTEND_INFO="${FRONTEND_INFO}\ FRONTEND_INFO="${FRONTEND_INFO}\
XForms Frontend:\n\ XForms Frontend:\n\
libXpm version:\t\t${XPM_VERSION}\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_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk" FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
RPM_FRONTEND="gtk" RPM_FRONTEND="gtk"
RPM_FRONTEND_DEPS='gtkmm >= 2.4.0'
GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4` GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4` LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
FRONTEND_INFO="${FRONTEND_INFO}\ FRONTEND_INFO="${FRONTEND_INFO}\
@ -214,7 +212,6 @@ for frontend in $FRONTENDS ; do
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)" FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2" FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
RPM_FRONTEND="qt" RPM_FRONTEND="qt"
RPM_FRONTEND_DEPS='qt >= 2.2.1'
FRONTEND_INFO="${FRONTEND_INFO}\ FRONTEND_INFO="${FRONTEND_INFO}\
Qt Frontend:\n\ Qt Frontend:\n\
Qt version:\t\t${QT_VERSION}\n" Qt version:\t\t${QT_VERSION}\n"
@ -319,7 +316,6 @@ ${FRONTEND_INFO}\
AC_SUBST(VERSION_INFO) AC_SUBST(VERSION_INFO)
AC_SUBST(RPM_FRONTEND) AC_SUBST(RPM_FRONTEND)
AC_SUBST(RPM_FRONTEND_DEPS)
## Some config.h stuff ## Some config.h stuff

6
development/ChangeLog
View File

@ -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> 2004-10-10 José Matos <jamatos@lyx.org>
* FORMAT: document change to format 237. * FORMAT: document change to format 237.

9
development/lyx.spec.in
View File

@ -1,5 +1,5 @@
%define frontend @RPM_FRONTEND@ %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 Summary: A WYSIWYM (What You See Is What You Mean) frontend to LaTeX
Name: @PACKAGE@ Name: @PACKAGE@
@ -13,7 +13,6 @@ Source: ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Icon: %{name}.xpm Icon: %{name}.xpm
Prefix: %{_prefix} Prefix: %{_prefix}
Requires: %{frontdep}, tetex-xdvi, tetex, tetex-latex
Obsoletes: tetex-lyx Obsoletes: tetex-lyx
%description %description
@ -42,7 +41,8 @@ This is LyX built with the %{frontend} frontend.
unset LINGUAS || true unset LINGUAS || true
./configure --with-frontend=%{frontend} --prefix=%{_prefix} \ ./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
--mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \ --mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
--without-warnings --disable-debug --enable-optimization=-O2 --without-warnings --disable-debug --enable-optimization=-O2 \
%{version_suffix}
make make
%install %install
@ -63,7 +63,8 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
# #
# Miscellaneous files # 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 cp lib/reLyX/README README.reLyX
%clean %clean