Re: patch for lyx.spec
I am looking over this patch. I don't think that the default lyx.spec should be qt-enabled. I will submit a patch which includes most (if not all) of Zvezdan's changes. ---Kayvan -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Re: patch for lyx.spec
On Wed, Feb 19, 2003 at 03:18:47PM -0800, Kayvan A. Sylvan wrote:
> I am looking over this patch.
>
> I don't think that the default lyx.spec should be qt-enabled. I will
> submit a patch which includes most (if not all) of Zvezdan's changes.
Okay, this is the patch. It is basically the same as Zvezdan's patch,
minus the --with-pspell and qt frontend.
I think the lyx.spec.in should create xforms RPMs by default and should
work with ispell. I want to know how many people use pspell versus ispell
before I change that part.
---Kayvan
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Index: development/lyx.spec.in
===
RCS file: /cvs/lyx/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.18
diff -u -u -r1.18 lyx.spec.in
--- development/lyx.spec.in 2002/12/19 18:38:30 1.18
+++ development/lyx.spec.in 2003/02/20 08:20:37
@@ -1,16 +1,19 @@
+%define frontend xforms
+%define frontdep libforms >= 1.0
+
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
-Url: http://www.lyx.org/
+Group: Applications/Publishing
+URL: http://www.lyx.org/
Packager: Kayvan A. Sylvan <[EMAIL PROTECTED]>
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{PACKAGE_VERSION}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-Icon: lyx.xpm
-Prefix: /usr
-Requires: xforms >= 0.89, tetex-xdvi, tetex, tetex-latex
+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
@@ -30,14 +33,16 @@
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} \
- --bindir=%{_bindir} --datadir=%{_datadir} \
- --without-warnings --disable-debug --enable-optimization=-O2
+./configure --with-frontend=%{frontend} --prefix=%{_prefix} \
+ --mandir=%{_mandir} --bindir=%{_bindir} --datadir=%{_datadir} \
+ --without-warnings --disable-debug --enable-optimization=-O2
make
%install
@@ -52,13 +57,13 @@
#
TEXMF=%{_datadir}/texmf
mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex
-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
- ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/lyx
+mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}/tex \
+ ${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 @@
# 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!" \
-%{_bindir}/reLyX
+perl -pi -e "s!/usr/share/%{name}!%{_datadir}/%{name}!" %{_bindir}/reLyX
fi
%postun
Re: patch for lyx.spec
Kayvan A. Sylvan wrote: > On Wed, Feb 19, 2003 at 03:18:47PM -0800, Kayvan A. Sylvan wrote: >> I am looking over this patch. >> >> I don't think that the default lyx.spec should be qt-enabled. I will >> submit a patch which includes most (if not all) of Zvezdan's changes. > > Okay, this is the patch. It is basically the same as Zvezdan's patch, > minus the --with-pspell and qt frontend. > > I think the lyx.spec.in should create xforms RPMs by default and should > work with ispell. I want to know how many people use pspell versus ispell > before I change that part. Kayvan, could it be made to honour the configure option --with-frontend=xforms/qt ? -- Angus
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 08:31:37AM +, Angus Leeming wrote: > Kayvan A. Sylvan wrote: > > > On Wed, Feb 19, 2003 at 03:18:47PM -0800, Kayvan A. Sylvan wrote: > >> I am looking over this patch. > >> > >> I don't think that the default lyx.spec should be qt-enabled. I will > >> submit a patch which includes most (if not all) of Zvezdan's changes. > > > > Okay, this is the patch. It is basically the same as Zvezdan's patch, > > minus the --with-pspell and qt frontend. > > > > I think the lyx.spec.in should create xforms RPMs by default and should > > work with ispell. I want to know how many people use pspell versus ispell > > before I change that part. > > Kayvan, could it be made to honour the configure option > --with-frontend=xforms/qt ? After applying the patch, just change the top definitions to: %define frontend qt %define frontdep qt >= 2.2.1 That will give you qt instead of xforms. -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Re: patch for lyx.spec
Kayvan A. Sylvan wrote: >> Kayvan, could it be made to honour the configure option >> --with-frontend=xforms/qt ? > > After applying the patch, just change the top definitions to: > > %define frontend qt > %define frontdep qt >= 2.2.1 > > That will give you qt instead of xforms. Sure, I understand. It just seems to me that something calling itself '.in' should be open to suggestions from the configure script. Anyway, it's a moot point since cvs.lyx.org has thrown a wobbly and is refusing to play anymore. -- Angus
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 08:52:43AM +, Angus Leeming wrote:
> Kayvan A. Sylvan wrote:
> >> Kayvan, could it be made to honour the configure option
> >> --with-frontend=xforms/qt ?
> >
> > After applying the patch, just change the top definitions to:
> >
> > %define frontend qt
> > %define frontdep qt >= 2.2.1
> >
> > That will give you qt instead of xforms.
>
> Sure, I understand. It just seems to me that something calling itself '.in'
> should be open to suggestions from the configure script.
>
> Anyway, it's a moot point since cvs.lyx.org has thrown a wobbly and is
> refusing to play anymore.
>
> --
> Angus
Oh. That would be good! ;-)
Do you mean something like this?
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89)
http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Index: config/ChangeLog
===
RCS file: /cvs/lyx/lyx-devel/config/ChangeLog,v
retrieving revision 1.88
diff -u -u -r1.88 ChangeLog
--- config/ChangeLog2003/02/18 18:00:51 1.88
+++ config/ChangeLog2003/02/20 10:20:11
@@ -1,3 +1,9 @@
+2003-02-20 Kayvan A. Sylvan <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* Makefile.am (EXTRA_DIST): add pkg.m4, relyx_configure.ac and
Index: config/configure.ac
===
RCS file: /cvs/lyx/lyx-devel/config/configure.ac,v
retrieving revision 1.28
diff -u -u -r1.28 configure.ac
--- config/configure.ac 2003/02/17 01:49:10 1.28
+++ config/configure.ac 2003/02/20 10:20:11
@@ -148,6 +148,8 @@
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
@@ -177,6 +179,8 @@
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)"
@@ -375,6 +379,10 @@
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
Index: config/configure.in
===
RCS file: /cvs/lyx/lyx-devel/config/configure.in,v
retrieving revision 1.21
diff -u -u -r1.21 configure.in
--- config/configure.in 2003/02/17 01:49:10 1.21
+++ config/configure.in 2003/02/20 10:20:11
@@ -151,6 +151,8 @@
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
@@ -182,6 +184,8 @@
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)"
@@ -275,6 +279,8 @@
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)
Index: development/lyx.spec.in
===
RCS file: /cvs/lyx/lyx-devel/development/lyx.spec.in,v
retrieving revision 1.18
diff -u -u -r1.18 lyx.spec.in
--- development/lyx.spec.in 2002/12/19 18:38:30 1.18
+++ development/lyx.spec.in 2003/02/20 10:20:11
@@ -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
-Url: http://www.lyx.org/
+Group: Applications/Publishing
+URL: http://www.lyx.org/
Packager: Kayvan A. Sylvan <[EMAIL PROTECTED]>
-Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{PACKAGE_VERSION}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-root
-Icon: lyx.xpm
-Prefix: /usr
-Requires: xforms >= 0.89, tetex-xdvi, tetex, tetex-latex
+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
@@ -30,14 +33,16 @@
With LyX, the author can concentr
Re: patch for lyx.spec
Kayvan A. Sylvan wrote: >> Sure, I understand. It just seems to me that something calling itself >> '.in' should be open to suggestions from the configure script. > Oh. That would be good! ;-) > > Do you mean something like this? Something like that, yes ;-) Does it work? (and can you keep hold of this for 10 days until Lars returns from his jolly jaunt to India and puts cvs.lyx.org back on its feet?) Isn't it time you went to bed? Must be 3am on the west coast... -- Angus
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 10:44:58AM +, Angus Leeming wrote: > Does it work? (and can you keep hold of this for 10 days until Lars returns > from his jolly jaunt to India and puts cvs.lyx.org back on its feet?) Is there really nothing we can do about baywatch? Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 10:44:58AM +, Angus Leeming wrote: > Kayvan A. Sylvan wrote: > >> Sure, I understand. It just seems to me that something calling itself > >> '.in' should be open to suggestions from the configure script. > > > Oh. That would be good! ;-) > > > > Do you mean something like this? > > Something like that, yes ;-) > > Does it work? (and can you keep hold of this for 10 days until Lars returns > from his jolly jaunt to India and puts cvs.lyx.org back on its feet?) Yes, it works. I tested it. Yes, I can keep this in limbo while Lars gets back. > Isn't it time you went to bed? Must be 3am on the west coast... Yeah... My sleep schedule has been non-existent recently. Between watching back-to-back episodes of the Sopranos on DVD and my crazy work schedule, I am lucky to get 5 hours of sleep per night. Goodnight, y'all! ---Kayvan -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Re: patch for lyx.spec
Andre Poenitz wrote: > On Thu, Feb 20, 2003 at 10:44:58AM +, Angus Leeming wrote: >> Does it work? (and can you keep hold of this for 10 days until Lars >> returns from his jolly jaunt to India and puts cvs.lyx.org back on its >> feet?) > > Is there really nothing we can do about baywatch? Isn't baywatch actually housed in TrollTech's offices? Drop Matthias Ettrich an email... -- Angus
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 11:23:50AM +, Angus Leeming wrote: > > Is there really nothing we can do about baywatch? > > Isn't baywatch actually housed in TrollTech's offices? Drop Matthias Ettrich > an email... Good idea actually. Andre' -- Those who desire to give up Freedom in order to gain Security, will not have, nor do they deserve, either one. (T. Jefferson)
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 12:24:33AM -0800, Kayvan A. Sylvan wrote: > I think the lyx.spec.in should create xforms RPMs by default and should > work with ispell. I want to know how many people use pspell versus ispell > before I change that part. it will work with ispell. If pspell isn't there, it will work. If it is there, users can add \use_pspell false to their preferences file john
Re: patch for lyx.spec
Now that baywatch is back up... I think we should put in the last patch I sent in last night that makes lyx.spec.in respond to the "configure --frontend" and also puts in the majority of Zvezdan's changes. -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Re: patch for lyx.spec
Kayvan A. Sylvan wrote: > Now that baywatch is back up... > > I think we should put in the last patch I sent in last night that > makes lyx.spec.in respond to the "configure --frontend" and also > puts in the majority of Zvezdan's changes. Done -- Angus
Re: patch for lyx.spec
On Thu, Feb 20, 2003 at 08:46:06PM +, Angus Leeming wrote: > Kayvan A. Sylvan wrote: > > > Now that baywatch is back up... > > > > I think we should put in the last patch I sent in last night that > > makes lyx.spec.in respond to the "configure --frontend" and also > > puts in the majority of Zvezdan's changes. > > Done Thanks. -- Kayvan A. Sylvan | Proud husband of | Father to my kids: Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena (8/8/89) http://sylvan.com/~kayvan | "crown of her husband" | Robin Gregory (2/28/92)
Re: patch for lyx.spec
> "Kayvan" == Kayvan A Sylvan <[EMAIL PROTECTED]> writes: Kayvan> Now that baywatch is back up... I think we should put in the Kayvan> last patch I sent in last night that makes lyx.spec.in respond Kayvan> to the "configure --frontend" and also puts in the majority of Kayvan> Zvezdan's changes. I guess these should go in 1.3.x too, right? Kayvan, another thing to think about: how difficult would it be to create lyx-common.noarch.rpm lyx-xforms.i386.rpm lyx-qt.i386.rpm where the last two would probably only contain the rpm, I guess. Another idea would be to have also lyx-l10n.noarch.rpm which contains the translated docs and maybe the po files. Is that difficult to do? What would be the best split? JMarc
Re: patch for lyx.spec
On Friday 21 February 2003 09:23, Jean-Marc Lasgouttes wrote: > Kayvan, another thing to think about: how difficult would it be to > create > lyx-common.noarch.rpm > lyx-xforms.i386.rpm > lyx-qt.i386.rpm > where the last two would probably only contain the rpm, I guess. ~~~ rpm -> binary of course (I would not have pointed this unless it was friday). > JMarc -- José Abílio
Re: patch for lyx.spec
> "José" == José Matos <[EMAIL PROTECTED]> writes: José> On Friday 21 February 2003 09:23, Jean-Marc Lasgouttes wrote: >> Kayvan, another thing to think about: how difficult would it be to >> create lyx-common.noarch.rpm lyx-xforms.i386.rpm lyx-qt.i386.rpm >> where the last two would probably only contain the rpm, I guess. José> ~~~ rpm -> José> binary of course (I would not have pointed this unless it was José> friday). You mean you are deliberately trying to be annoying? I'll remember that. JMarc
Re: patch for lyx.spec
On Fri, Feb 21, 2003 at 10:23:06AM +0100, Jean-Marc Lasgouttes wrote: > Kayvan, another thing to think about: how difficult would it be to > create > lyx-common.noarch.rpm > lyx-xforms.i386.rpm > lyx-qt.i386.rpm > where the last two would probably only contain the rpm, I guess. It's fairly easy to produce multiple rpm binary packages from a single source rpm. However, having two different executables would require two compilations during the building of rpms. Also, the executables would have to be called differently. One of them can be called lyx, the other perhaps lyx-qt. -- Zvezdan Petkovic
Re: patch for lyx.spec
> "Zvezdan" == Zvezdan Petkovic <[EMAIL PROTECTED]> writes: Zvezdan> On Fri, Feb 21, 2003 at 10:23:06AM +0100, Jean-Marc Zvezdan> Lasgouttes wrote: >> Kayvan, another thing to think about: how difficult would it be to >> create lyx-common.noarch.rpm lyx-xforms.i386.rpm lyx-qt.i386.rpm >> where the last two would probably only contain the rpm, I guess. Zvezdan> It's fairly easy to produce multiple rpm binary packages from Zvezdan> a single source rpm. However, having two different Zvezdan> executables would require two compilations during the Zvezdan> building of rpms. Indeed. Zvezdan> Also, the executables would have to be called differently. Zvezdan> One of them can be called lyx, the other perhaps lyx-qt. Yes, I was thinking of lyx-xforms and lyx-qt. I do not say this is something we should do right now, but it would be nice to think about it. JMarc
