rpms/kdelibs4/devel kdelibs-3.94.0-version-kpty.diff, NONE, 1.1 kdelibs4.spec, 1.4, 1.5

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Thu Oct 18 10:43:26 UTC 2007


Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25791/devel

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-3.94.0-version-kpty.diff 
Log Message:
backport upstream fix for unversioned kpty library (rev 724528)

kdelibs-3.94.0-version-kpty.diff:

--- NEW FILE kdelibs-3.94.0-version-kpty.diff ---
--- trunk/KDE/kdelibs/kpty/CMakeLists.txt	2007/10/12 14:59:40	724527
+++ trunk/KDE/kdelibs/kpty/CMakeLists.txt	2007/10/12 15:01:14	724528
@@ -13,7 +13,7 @@
 
 target_link_libraries(kpty ${KDE4_KDECORE_LIBS} ${UTIL_LIBRARY})
 
-#set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
+set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kpty
              RUNTIME DESTINATION ${BIN_INSTALL_DIR}
              LIBRARY DESTINATION ${LIB_INSTALL_DIR}


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/devel/kdelibs4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdelibs4.spec	18 Oct 2007 10:20:50 -0000	1.4
+++ kdelibs4.spec	18 Oct 2007 10:42:52 -0000	1.5
@@ -41,6 +41,9 @@
 Patch1: kdelibs-3.93.0-kde149703.diff
 # fix kde#149705
 Patch2: kdelibs-3.93.0-kde149705.diff
+# upstream patch by Oswald Buddenhagen to fix unversioned kpty library
+# SVN revision 724528
+Patch3: kdelibs-3.94.0-version-kpty.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -108,6 +111,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p3
 
 
 %build
@@ -224,6 +228,7 @@
 - update parallel-devel patch
 - drop kde#149704 patch, fixed upstream
 - drop colorscheme-hack patch
+- backport upstream fix for unversioned kpty library (rev 724528)
 
 * Thu Oct 4 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-11
 - don't make this the default kdelibs on F9 yet




More information about the scm-commits mailing list