This commit is contained in:
parent
6420f1fecf
commit
58d5180576
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:79bc61022e79c800b186cba3fbbbadd398d18a33a87ec4e337a7bfab77c7aecb
|
||||
size 10335442
|
13
lyx-1.6.3.diff
Normal file
13
lyx-1.6.3.diff
Normal file
@ -0,0 +1,13 @@
|
||||
Index: lyx-1.6.3/src/frontends/qt4/LengthCombo.cpp
|
||||
===================================================================
|
||||
--- lyx-1.6.3.orig/src/frontends/qt4/LengthCombo.cpp
|
||||
+++ lyx-1.6.3/src/frontends/qt4/LengthCombo.cpp
|
||||
@@ -27,7 +27,7 @@ LengthCombo::LengthCombo(QWidget * paren
|
||||
for (int i = 0; i < lyx::num_units; i++) {
|
||||
// mu does not make sense usually
|
||||
// so it must be added manually, if needed
|
||||
- if (lyx::unit_name[i] == "mu")
|
||||
+ if (!strcmp(lyx::unit_name[i], "mu"))
|
||||
continue;
|
||||
QComboBox::addItem(lyx::qt_(lyx::unit_name_gui[i]),
|
||||
lyx::toqstr(lyx::unit_name[i]));
|
3
lyx-1.6.3.tar.bz2
Normal file
3
lyx-1.6.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3f3288bafb6750cf618f19d31509ad7bbae324496cfaecebf60df90d7bf614fb
|
||||
size 10930791
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 9 09:51:38 CEST 2009 - coolo@novell.com
|
||||
|
||||
- update to 1.6.3: Qt 4.5 support
|
||||
- fix build in not including boost
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 16 01:12:54 CET 2009 - ro@suse.de
|
||||
|
||||
|
25
lyx.spec
25
lyx.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package lyx (Version 1.6.0)
|
||||
# spec file for package lyx (Version 1.6.3)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -30,12 +30,13 @@ License: LGPL v2.1 or later
|
||||
Group: Productivity/Publishing/TeX/Frontends
|
||||
Requires: texlive-latex ImageMagick free-ttf-fonts
|
||||
AutoReqProv: on
|
||||
Version: 1.6.0
|
||||
Release: 2
|
||||
%define rversion 1.6.0
|
||||
Version: 1.6.3
|
||||
Release: 1
|
||||
%define rversion 1.6.3
|
||||
Summary: LaTeX-Based WYSIWYG Editor
|
||||
Url: http://www.lyx.org/
|
||||
Source: lyx-%{rversion}.tar.bz2
|
||||
Patch0: lyx-1.6.3.diff
|
||||
Source1: lyx.desktop
|
||||
Source2: lyx.png
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -55,14 +56,13 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{rversion}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
#%{?suse_update_config:%{suse_update_config -f config}}
|
||||
#./autogen.sh
|
||||
export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR -fno-inline"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR -fno-inline"
|
||||
export QTDIR=/usr/lib/qt3/
|
||||
export PATH=$QTDIR/bin:$PATH
|
||||
export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -DHAVE_STRERROR"
|
||||
TEXMF=%{_datadir}/texmf
|
||||
%if %suse_version > 1020
|
||||
TEXMF=$(kpsexpand '$TEXMFMAIN')
|
||||
@ -72,14 +72,12 @@ TEXMF=$(kpsexpand '$TEXMFDIST')
|
||||
%endif
|
||||
%configure \
|
||||
--with-texmf=$TEXMF \
|
||||
--without-included-boost \
|
||||
%if %suse_version < 1020
|
||||
--with-extra-inc=/usr/X11R6/include/X11 \
|
||||
%endif
|
||||
--with-aspell \
|
||||
--with-frontend=qt4 \
|
||||
--with-qt-dir=$QTDIR \
|
||||
--with-qt-libraries=$QTDIR/%{_lib} \
|
||||
--with-qt-includes=$QTDIR/include
|
||||
--with-frontend=qt4
|
||||
make %{?jobs:-j%jobs}
|
||||
|
||||
%install
|
||||
@ -127,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_mandir}/man1/tex2lyx.1.gz
|
||||
|
||||
%changelog
|
||||
* Tue Jun 09 2009 coolo@novell.com
|
||||
- update to 1.6.3: Qt 4.5 support
|
||||
- fix build in not including boost
|
||||
* Mon Feb 16 2009 ro@suse.de
|
||||
- drop buildreq for lprng
|
||||
* Mon Nov 10 2008 stbinner@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user