rpms/lyx/devel changeset_r17666.diff,NONE,1.1 lyx.spec,1.52,1.53

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7260

Modified Files:
	lyx.spec 
Added Files:
	changeset_r17666.diff 
Log Message:
* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.4.beta1
- fix qt-4.3 crasher

* Tue Mar 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.3.beta1
- stop omitting -fexceptions



changeset_r17666.diff:

--- NEW FILE changeset_r17666.diff ---
Index: /lyx-devel/trunk/src/frontends/WorkArea.C
===================================================================
--- lyx-devel/trunk/src/frontends/WorkArea.C (revision 17033)
+++ lyx-devel/trunk/src/frontends/WorkArea.C (revision 17666)
@@ -244,6 +244,6 @@
 	buffer_view_->workAreaResize(width(), height());
 	lyx_view_.updateLayoutChoice();
-	lyx_view_.busy(false);
 	lyx_view_.clearMessage();
+    lyx_view_.busy(false);
 }
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- lyx.spec	21 Mar 2007 13:36:58 -0000	1.52
+++ lyx.spec	2 Apr 2007 18:02:25 -0000	1.53
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.5.0
-Release: 0.2.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -13,6 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.5.0beta1-xdg-open.patch 
+# http://www.lyx.org/trac/changeset/17666?format=diff&new=17666
+Patch2: changeset_r17666.diff
 
 Source1: lyxrc.dist
 
@@ -77,15 +79,11 @@
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg_open
+%patch2 -p2 -b .qt43
 
 
 %build
 
-# drop -fexceptions from optflags, suggested by lyx devs:
-# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg85794.html
-optflags="$(echo %optflags | sed -e 's|-fexceptions||' )"
-%global optflags $optflags
-
 %configure \
   --disable-rpath \
   --enable-optimization="%{optflags}" \
@@ -174,6 +172,12 @@
 
 
 %changelog
+* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.4.beta1
+- fix qt-4.3 crasher
+
+* Tue Mar 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.3.beta1
+- stop omitting -fexceptions 
+
 * Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.2.beta1
 - +Requires: tetex-IEEEtran (#232840)