rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, NONE, 1.1 kdebindings.spec, 1.269, 1.270

Kevin Kofler kkofler at fedoraproject.org
Fri Dec 11 23:22:59 UTC 2009


Author: kkofler

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.80-fix-build.patch 
Log Message:
* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
- fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)

kdebindings-4.3.80-fix-build.patch:
 smokeconfig.xml |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebindings-4.3.80-fix-build.patch ---
diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
--- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
+++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100
@@ -24,6 +24,7 @@
         <signature>.*Q3.*</signature>
         
         <signature>.*Nepomuk::ResourceManager::allResources\(\).*</signature>
+        <signature>.*Nepomuk::ResourceManager::generateUniqueUri\(.*</signature>
     </exclude>
     <functions>
         <!-- everything in that namespace.. -->


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- kdebindings.spec	11 Dec 2009 23:06:44 -0000	1.269
+++ kdebindings.spec	11 Dec 2009 23:22:57 -0000	1.270
@@ -52,7 +52,7 @@
 
 Name: kdebindings
 Version: 4.3.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -67,7 +67,10 @@ Patch0:  kdebindings-qyoto-examples.patc
 # fix build with CMAKE_SKIP_RPATH - also needs sed line below
 # WARNING: This is a bunch of quick hacks to get this to build. Please do not
 #          commit this upstream without further discussion.
-Patch2:  kdebindings-4.3.75-no-rpath.patch
+Patch1:  kdebindings-4.3.75-no-rpath.patch
+# fix the NepomukSmoke build by blacklisting
+# Nepomuk::ResourceManager::generateUniqueUri
+Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
 
@@ -276,11 +279,12 @@ Falcon plugin for the Kross archtecture 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
 %patch0
+%patch2 -p1 -b .fix-build
 
 # upstream patches
 
 # do the no-rpath hack last, after the upstream backports (if any)
-%patch2 -p1 -b .no-rpath
+%patch1 -p1 -b .no-rpath
 sed -i -e 's!COMMAND generator!COMMAND ${PROJECT_BINARY_DIR}/generator/bin/generator${CMAKE_EXECUTABLE_SUFFIX}.shell!g' -e 's/WORKING_DIRECTORY/DEPENDS generator WORKING_DIRECTORY/g' smoke/*/CMakeLists.txt
 
 
@@ -544,10 +548,13 @@ fi
 
 
 %changelog
+* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+- fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
+
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin
 
-* Tue Dec  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+* Tue Dec 01 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)
 
 * Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.4.svn1048496




More information about the fedora-extras-commits mailing list