rpms/lyx/devel lyx-1.6.5-ImplicitDSOLinking.patch, NONE, 1.1 lyx.spec, 1.106, 1.107

Rex Dieter rdieter at fedoraproject.org
Sun Feb 14 21:53:33 UTC 2010


Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21730

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.6.5-ImplicitDSOLinking.patch 
Log Message:
* Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-5
- FTBFS lyx-1.6.5-4.fc13: ImplicitDSOLinking (#565009)


lyx-1.6.5-ImplicitDSOLinking.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lyx-1.6.5-ImplicitDSOLinking.patch ---
diff -up lyx-1.6.5/src/frontends/qt4/Makefile.am.ImplicitDSOLinking lyx-1.6.5/src/frontends/qt4/Makefile.am
--- lyx-1.6.5/src/frontends/qt4/Makefile.am.ImplicitDSOLinking	2010-02-14 15:50:50.858368341 -0600
+++ lyx-1.6.5/src/frontends/qt4/Makefile.am	2010-02-14 15:51:19.367368776 -0600
@@ -35,7 +35,7 @@ noinst_LTLIBRARIES = liblyxqt4.la
 
 liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
 liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)
-liblyxqt4_la_LIBADD = $(QT4_LIB)
+liblyxqt4_la_LIBADD = $(QT4_LIB) $(X_LIBS)
 
 AM_CPPFLAGS += \
 	$(QT4_CPPFLAGS) \


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- lyx.spec	21 Jan 2010 14:30:40 -0000	1.106
+++ lyx.spec	14 Feb 2010 21:53:33 -0000	1.107
@@ -22,7 +22,7 @@ BuildRequires: fontpackages-devel
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -35,9 +35,10 @@ Patch1: lyx-1.6.5-xdg_open.patch
 # This patch should be upstream for lyx-1.6.6
 # (we only need this because of patch #50)
 Patch2: lyx-1.6.5-autoconf_2.65.patch
-## upstreamed patches
+## upstreamable patches
 # http://bugzilla.redhat.com/524046 , http://www.lyx.org/trc/ticket/6226
 Patch50: lyx-1.6.5-enchant.patch
+Patch51: lyx-1.6.5-ImplicitDSOLinking.patch
 
 Source1: lyxrc.dist
 
@@ -156,8 +157,9 @@ A collection of Math symbol fonts for %{
 %patch2 -p1 -b .autoconf_2.65
 
 %patch50 -p1 -b .enchant
+%patch51 -p1 -b .ImplicitDSOLinking
 
-# needed by patch50
+# needed by patch50/51
 ./autogen.sh
 
 
@@ -284,6 +286,9 @@ fc-cache %{_fontdir} 2> /dev/null ||:
 
 
 %changelog
+* Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-5
+- FTBFS lyx-1.6.5-4.fc13: ImplicitDSOLinking (#565009)
+
 * Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-4
 - -fonts: Provides: lyx-{cmex10,cmmi10,cmr10,cmsy10}-fonts
 



More information about the scm-commits mailing list