rpms/kscope/devel kscope-1.9.4-implicit-DSO-libqscintilla2.patch, NONE, 1.1 kscope.spec, 1.11, 1.12

Tom Callaway spot at fedoraproject.org
Wed Feb 10 20:42:07 UTC 2010


Author: spot

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

Modified Files:
	kscope.spec 
Added Files:
	kscope-1.9.4-implicit-DSO-libqscintilla2.patch 
Log Message:
fix implicit DSO linking

kscope-1.9.4-implicit-DSO-libqscintilla2.patch:
 app.pro |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kscope-1.9.4-implicit-DSO-libqscintilla2.patch ---
diff -up kscope-1.9.4/app/app.pro.DSO kscope-1.9.4/app/app.pro
--- kscope-1.9.4/app/app.pro.DSO	2010-02-10 15:38:06.301766155 -0500
+++ kscope-1.9.4/app/app.pro	2010-02-10 15:38:17.342775777 -0500
@@ -58,7 +58,8 @@ LIBS += -L../core \
     -L../cscope \
     -lkscope_cscope \
     -L../editor \
-    -lkscope_editor
+    -lkscope_editor \
+    -lqscintilla2
 RESOURCES = app.qrc
 target.path = $${INSTALL_PATH}/bin
 INSTALLS += target


Index: kscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kscope/devel/kscope.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kscope.spec	25 Jul 2009 04:48:23 -0000	1.11
+++ kscope.spec	10 Feb 2010 20:42:06 -0000	1.12
@@ -1,11 +1,12 @@
 Name:		kscope
 Summary: 	QT front-end to Cscope
 Version:	1.9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 Source0:	http://download.sourceforge.net/kscope/%{name}-%{version}.tar.gz
 Source1:	kscope.desktop
+Patch0:		kscope-1.9.4-implicit-DSO-libqscintilla2.patch
 URL:		http://kscope.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils, qt4-devel, gettext, qscintilla-devel
@@ -32,6 +33,7 @@ Development files for kscope.
 
 %prep
 %setup -q
+%patch0 -p1 -b .DSO
 sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' config
 for i in app/app.pro core/core.pro cscope/cscope.pro editor/editor.pro; do
 	sed -i 's|/lib|/%{_lib}|g' $i
@@ -72,6 +74,9 @@ rm -rf %{buildroot}
 %{_libdir}/libkscope_editor.so
 
 %changelog
+* Wed Feb 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9.4-3
+- fix implicit DSO linking issue with libqscintilla2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list