From 58d5180576f043bfed5b3ac918bcec9bd23d5f213901c77cf2ca92c1930c7969 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 9 Jun 2009 08:53:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=18

---
 lyx-1.6.0.tar.bz2 |  3 ---
 lyx-1.6.3.diff    | 13 +++++++++++++
 lyx-1.6.3.tar.bz2 |  3 +++
 lyx.changes       |  6 ++++++
 lyx.spec          | 25 +++++++++++++------------
 5 files changed, 35 insertions(+), 15 deletions(-)
 delete mode 100644 lyx-1.6.0.tar.bz2
 create mode 100644 lyx-1.6.3.diff
 create mode 100644 lyx-1.6.3.tar.bz2

diff --git a/lyx-1.6.0.tar.bz2 b/lyx-1.6.0.tar.bz2
deleted file mode 100644
index 9db4314..0000000
--- a/lyx-1.6.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79bc61022e79c800b186cba3fbbbadd398d18a33a87ec4e337a7bfab77c7aecb
-size 10335442
diff --git a/lyx-1.6.3.diff b/lyx-1.6.3.diff
new file mode 100644
index 0000000..71301a7
--- /dev/null
+++ b/lyx-1.6.3.diff
@@ -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]));
diff --git a/lyx-1.6.3.tar.bz2 b/lyx-1.6.3.tar.bz2
new file mode 100644
index 0000000..b00872d
--- /dev/null
+++ b/lyx-1.6.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f3288bafb6750cf618f19d31509ad7bbae324496cfaecebf60df90d7bf614fb
+size 10930791
diff --git a/lyx.changes b/lyx.changes
index 54d2ae0..585ae5e 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -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
 
diff --git a/lyx.spec b/lyx.spec
index cfde1d2..cf98a07 100644
--- a/lyx.spec
+++ b/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