rpms/kdebindings/F-12 kdebindings-4.3.75-no-rpath.patch, NONE, 1.1 .cvsignore, 1.67, 1.68 kdebindings.spec, 1.253, 1.254 sources, 1.75, 1.76 kdebindings-4.2.85-old-PyQt4.patch, 1.2, NONE kdebindings-qyoto-examples.patch, 1.1, NONE

Lukas Tinkl ltinkl at fedoraproject.org
Wed Feb 10 14:21:06 UTC 2010


Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11165/F-12

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.3.75-no-rpath.patch 
Removed Files:
	kdebindings-4.2.85-old-PyQt4.patch 
	kdebindings-qyoto-examples.patch 
Log Message:
KDE 4.4.0


kdebindings-4.3.75-no-rpath.patch:
 CMakeLists.txt |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdebindings-4.3.75-no-rpath.patch ---
diff -ur kdebindings-4.3.75svn1048496/generator/CMakeLists.txt kdebindings-4.3.75svn1048496-no-rpath/generator/CMakeLists.txt
--- kdebindings-4.3.75svn1048496/generator/CMakeLists.txt	2009-08-20 04:41:46.000000000 +0200
+++ kdebindings-4.3.75svn1048496-no-rpath/generator/CMakeLists.txt	2009-11-26 17:12:25.000000000 +0100
@@ -1,9 +1,10 @@
 project(smokegenerator)
 
-find_package(Qt4 REQUIRED)
+find_package(KDE4 REQUIRED)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
 
 include_directories(${QT_INCLUDES} parser)
 
@@ -20,7 +21,7 @@
     type.cpp
 )
 
-add_executable(generator ${generator_SRC})
+kde4_add_executable(generator ${generator_SRC})
 target_link_libraries(generator ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} cppparser)
 set_target_properties(generator PROPERTIES COMPILE_DEFINITIONS __GENERATOR_BUILDING ENABLE_EXPORTS TRUE)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore	22 Jan 2010 19:54:00 -0000	1.67
+++ .cvsignore	10 Feb 2010 14:21:05 -0000	1.68
@@ -1 +1 @@
-kdebindings-4.3.5.tar.bz2
+kdebindings-4.4.0.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/kdebindings.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- kdebindings.spec	22 Jan 2010 19:54:00 -0000	1.253
+++ kdebindings.spec	10 Feb 2010 14:21:05 -0000	1.254
@@ -29,8 +29,9 @@
 %define java 0
 %endif
 
+%define akonadi_version 1.3.0
 %define pykde4_akonadi 1
-%define pyqt4_version 4.6.1
+%define pyqt4_version 4.7
 
 %if 0%{?rhel}
 %define falcon 0
@@ -52,7 +53,7 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.5
+Version: 4.4.0
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -63,27 +64,25 @@ URL: http://developer.kde.org/language-b
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# patch to disable examples (trouble with them installing to the buildroot)
-Patch0:  kdebindings-qyoto-examples.patch
-# workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
-Patch1:  kdebindings-4.2.85-old-PyQt4.patch
-# try to fix build with Qt 4.6
-#Patch2:  kdebindings-4.3.3-qt46.patch
+# 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
 
-
-BuildRequires:  akonadi-devel >= 1.1.0
+BuildRequires:  akonadi-devel >= %{akonadi_version} 
 BuildRequires:  kdebase-workspace-devel >= %{version}
 # okular bindings
 BuildRequires:  kdegraphics-devel >= %{version}
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-%if 0%{?fedora} && 0%{?fedora} < 12
+%if 0%{?fedora} && 0%{?fedora} < 12 
+# kdebindings does not support polkit-qt-1 yet
 BuildRequires:  polkit-qt-devel
 %endif
 BuildRequires:  python-devel
-BuildRequires:  PyQt4-devel >= %{pyqt4_version}
+BuildRequires:  PyQt4-devel >= %{pyqt4_version}, sip-devel
 BuildRequires:  qimageblitz-devel
 %if 0%{?fedora}
 BuildRequires:  qscintilla-devel >= 2.4
@@ -173,7 +172,7 @@ Provides: kimono4 = %{version}-%{release
 %package -n qyoto
 Group:    Development/Languages
 Summary:  C# bindings for Qt4
-Requires: qt4 >= %{_qt4_version} 
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 Provides: qyoto4 = %{version}-%{release}
 %description -n qyoto
 %{summary}.
@@ -210,7 +209,7 @@ Provides: korundum4-devel = %{version}-%
 %package -n QtRuby
 Group:    Development/Languages
 Summary:  Ruby bindings for Qt4
-Requires: qt4 >= %{_qt4_version} 
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 Provides: QtRuby4 = %{version}-%{release}
 Requires: ruby
 %description -n QtRuby
@@ -229,7 +228,7 @@ Provides: QtRuby4-devel = %{version}-%{r
 %package -n php-qt
 Group:    Development/Languages
 Summary:  PHP bindings for Qt4
-Requires: qt4 >= %{_qt4_version} 
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 Provides: php-qt4 = %{version}-%{release}
 %description -n php-qt
 %{summary}.
@@ -275,15 +274,22 @@ Falcon plugin for the Kross archtecture 
 
 
 %prep
-%setup -q
-%patch0
-%patch1 -p0 -b .old-PyQt4
-#if 0%{?fedora} > 12 
-#patch2 -p1 -b .qt46
-#endif
+%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
+
 
 %build
 mkdir -p %{_target_platform}
@@ -352,8 +358,9 @@ rm -f %{buildroot}%{_kde4_appsdir}/pykde
 mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
 
 # bz#551534 - qyoto doesn't pull mono in
+%if 0%{?csharp}
 find %{buildroot} -name \*.dll -not -type l | xargs chmod ugo+x
-
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -380,10 +387,15 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %if 0%{?smoke}
+%{_kde4_bindir}/smokeapi
 %{_includedir}/smoke.h
 %{_includedir}/smoke/
 %{_kde4_libdir}/libsmoke*.so
 %endif
+%{_kde4_bindir}/smokegen
+%{_kde4_libdir}/libcppparser.so
+%{_kde4_libdir}/smokegen/
+%{_kde4_datadir}/smokegen/
 %endif
 
 %files -n PyKDE4
@@ -420,14 +432,14 @@ fi
 %{_kde4_libdir}/libplasma-sharp.so
 %{_kde4_libdir}/libsoprano-sharp.so
 %{_kde4_libdir}/libqimageblitz-sharp.so
-%{_kde4_libdir}/mono/2.0/qimageblitz.dll
-%{_kde4_libdir}/mono/2.0/akonadi.dll
-%{_kde4_libdir}/mono/2.0/kde-dotnet.dll
-%{_kde4_libdir}/mono/2.0/khtml-dll.dll
-%{_kde4_libdir}/mono/2.0/ktexteditor-dotnet.dll
-%{_kde4_libdir}/mono/2.0/nepomuk-dll.dll
-%{_kde4_libdir}/mono/2.0/plasma-dll.dll
-%{_kde4_libdir}/mono/2.0/soprano.dll
+%{_kde4_libdir}/mono/qyoto/qimageblitz.dll
+%{_kde4_libdir}/mono/qyoto/akonadi.dll
+%{_kde4_libdir}/mono/qyoto/kde-dotnet.dll
+%{_kde4_libdir}/mono/qyoto/khtml-dll.dll
+%{_kde4_libdir}/mono/qyoto/ktexteditor-dotnet.dll
+%{_kde4_libdir}/mono/qyoto/nepomuk-dll.dll
+%{_kde4_libdir}/mono/qyoto/plasma-dll.dll
+%{_kde4_libdir}/mono/qyoto/soprano.dll
 %{_kde4_libdir}/mono/gac/akonadi/
 %{_kde4_libdir}/mono/gac/kde-dotnet/
 %{_kde4_libdir}/mono/gac/khtml-dll/
@@ -449,11 +461,12 @@ fi
 %{_kde4_libdir}/libqyoto.so
 %{_kde4_libdir}/libqyotoshared.so.1
 %{_kde4_libdir}/libqyotoshared.so.1.0.0
-%{_kde4_libdir}/mono/2.0/qt-dotnet.dll
-%{_kde4_libdir}/mono/2.0/qtscript.dll
-%{_kde4_libdir}/mono/2.0/qttest.dll
-%{_kde4_libdir}/mono/2.0/qtuitools.dll
-%{_kde4_libdir}/mono/2.0/qtwebkit.dll
+%dir %{_kde4_libdir}/mono/qyoto/
+%{_kde4_libdir}/mono/qyoto/qt-dotnet.dll
+%{_kde4_libdir}/mono/qyoto/qtscript.dll
+%{_kde4_libdir}/mono/qyoto/qttest.dll
+%{_kde4_libdir}/mono/qyoto/qtuitools.dll
+%{_kde4_libdir}/mono/qyoto/qtwebkit.dll
 %{_kde4_libdir}/mono/gac/qt-dotnet/
 %{_kde4_libdir}/mono/gac/qtscript/
 %{_kde4_libdir}/mono/gac/qttest/
@@ -549,14 +562,65 @@ fi
 
 
 %changelog
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
-- 4.3.5
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 4.4.0-1
+- 4.4.0
 
-* Tue Jan 12 2010 Than Ngo <than at redhat.com> - 4.3.4-2
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Sun Jan 24 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.95-2
+- fix Qyoto build
+- revert revision 1076633 which breaks the Plasma C# bindings
+
+* Thu Jan 21 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+
+* Tue Jan 12 2010 Than Ngo <than at redhat.com> - 4.3.90-3
 - fix bz#551534, qyoto doesn't pull mono in
 
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
+- akonadi_version 1.2.90
+- pyqt4_version 4.7
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.90 (4.4rc1)
+
+* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-4
+- upstream enum patch
+
+* Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
+- tarball respin, includes build-fix'es
+
+* Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
+- fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
+- fix its build (missing #include <nepomuk/resourcetypeterm.h>)
+- fix phpqt_internals.cpp for the current smoke.h
+- Qyoto/Kimono DLLs are now in mono/qyoto rather than mono/2.0
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
+* Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+- fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
+- fix the PyKDE4 Akonadi, kdeui and Phonon bindings to build
+
+* Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
+- respin
+
+* 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
+- update generator and smoke to the current trunk for more fixes
+
+* Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
+- update generator to trunk rev 1052427 for fixes
+
+* Thu Nov 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.2.svn1048496
+- fix build with CMAKE_SKIP_RPATH
+
+* Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- update to 4.3.75 snapshot
 
 * Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
 - Requires: sip-api(%%_sip_api_major) >= %%_sip_api


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	22 Jan 2010 19:54:01 -0000	1.75
+++ sources	10 Feb 2010 14:21:05 -0000	1.76
@@ -1 +1 @@
-1309f89dc092aea932138b1444e64280  kdebindings-4.3.5.tar.bz2
+fe9617eeb6430d12428d4bf1898bc955  kdebindings-4.4.0.tar.bz2


--- kdebindings-4.2.85-old-PyQt4.patch DELETED ---


--- kdebindings-qyoto-examples.patch DELETED ---



More information about the scm-commits mailing list