rpms/kdebindings/devel kdebindings-4.4.80-smoke_qsci.patch, NONE, 1.1 kdebindings.spec, 1.312, 1.313 kdebindings-4.3.75-no-rpath.patch, 1.6, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22835

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.4.80-smoke_qsci.patch 
Removed Files:
	kdebindings-4.3.75-no-rpath.patch 
Log Message:
drop < f12 legacy stuff
upstream smoke_qsci patch
disable smoke building against qt47 (for now)


kdebindings-4.4.80-smoke_qsci.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebindings-4.4.80-smoke_qsci.patch ---
--- trunk/KDE/kdebindings/smoke/qsci/CMakeLists.txt	2010/02/03 14:54:40	1084711
+++ trunk/KDE/kdebindings/smoke/qsci/CMakeLists.txt	2010/05/22 12:24:17	1129444
@@ -17,7 +17,7 @@
 	${CMAKE_CURRENT_BINARY_DIR}/x_10.cpp
 
     COMMAND smokegen
-    ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qt/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+    ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtgui/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
          -I "${QSCINTILLA_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/qscintilla2_includes.h
     DEPENDS smokegen generator_smoke WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -p -r1.312 -r1.313
--- kdebindings.spec	24 May 2010 19:19:29 -0000	1.312
+++ kdebindings.spec	26 May 2010 20:33:44 -0000	1.313
@@ -1,34 +1,23 @@
 
-# define to enable these optional bits
-## arch'es matching mono's ExclusiveArch set
-%if 0%{?fedora} > 11
+%if 0%{?fedora}
+# arch'es matching mono's Arch set
 %ifnarch sparc64
-%define csharp 1
-%endif
-%endif
-%if 0%{?fedora} == 11
-%ifarch %{ix86} x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64 
-%define csharp 1
-%endif
-%endif
-%if 0%{?fedora} == 10
-%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x ppc
-%define csharp 1
-%endif
+%define csharp 0
 %endif
-%if 0%{?fedora}
 # FIXME: Krossfalcon doesn't build in Rawhide (Falcon 0.9.x).
 #        It's also not working properly. And there are no Falcon bindings for
 #        the libraries anyway, just the Kross backend. -- Kevin
-%if 0%{?fedora} < 12
-%define falcon 1
+%define falcon 0
+%define php 1 
+%define ruby 1 
+## smoke qt47 bindings currently busted
+%if "%{?_qt4_version}%{!?_qt4_version:4.6.2}" < "4.7.0" 
+%define smoke 1 
 %endif
-%define php 1
-%define ruby 1
-%define smoke 1
 %define java 0
 %endif
 
+%define devel 1
 %define pykde4_akonadi 1
 %define pyqt4_version 4.7
 
@@ -41,16 +30,14 @@
 %define csharp 0
 %endif
 
-%if 0%{?ruby}%{?smoke}
-%define devel 1
-%endif
-
 %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
+%global _cmake_skip_rpath %{nil}
+
 Name: kdebindings
 Version: 4.4.80
 Release: 1%{?dist}
@@ -61,14 +48,11 @@ License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+#Source0: kdebindings-1130463.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# 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.
-Patch1:  kdebindings-4.3.75-no-rpath.patch
-
 ## upstream patches
+Patch100: kdebindings-4.4.80-smoke_qsci.patch
 
 BuildRequires:  akonadi-devel
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -76,10 +60,8 @@ BuildRequires:  kdebase-workspace-devel 
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-%if 0%{?fedora} && 0%{?fedora} < 12 
 # kdebindings does not support polkit-qt-1 yet
-BuildRequires:  polkit-qt-devel
-%endif
+#BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version}, sip-devel
 BuildRequires:  qimageblitz-devel
@@ -276,18 +258,7 @@ Falcon plugin for the Kross archtecture 
 %setup -q -n kdebindings-%{version}%{?alphatag}
 
 # upstream patches
-
-# do the no-rpath hack last, after the upstream backports (if any)
-#if 0%{?fedora} > 12
-%if 0
-%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
-%else
-# the above breaks < f12 builds , maybe it's time to fix kde4/cmake macros
-# properly to just not rpath stuff in %%_libdir/kde4/devel and stop hard-coding
-# CMAKE_SKIP_RPATH everywhere
-%global _cmake_skip_rpath %{nil}
-%endif
+%patch100 -p3 -b .smoke_qsci
 
 
 %build


--- kdebindings-4.3.75-no-rpath.patch DELETED ---