[kdebindings] 4.6.95 (rc2)

Jaroslav Reznik jreznik at fedoraproject.org
Mon Jul 11 11:51:09 UTC 2011 

commit b8bac8070d506ca5f07fd28db9922e37cab87605
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Jul 11 13:50:48 2011 +0200

    4.6.95 (rc2)

 .gitignore                               |   35 ++----
 kdebindings-4.6.90-packaging_cmake.patch |    6 +-
 kdebindings.spec                         |  184 +-----------------------------
 sources                                  |   21 ++--
 4 files changed, 29 insertions(+), 217 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b38454f..6cb6a3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,10 @@
-/kdebindings-4.6.2.tar.bz2
-/kdebindings-4.6.3.tar.bz2
-/kdebindings-4.6.80.tar.bz2
-/kimono-4.6.80.tar.bz2
-/korundum-4.6.80.tar.bz2
-/perlkde-4.6.80.tar.bz2
-/perlqt-4.6.80.tar.bz2
-/pykde4-4.6.80.tar.bz2
-/qtruby-4.6.80.tar.bz2
-/qyoto-4.6.80.tar.bz2
-/smokegen-4.6.80.tar.bz2
-/smokekde-4.6.80.tar.bz2
-/smokeqt-4.6.80.tar.bz2
-/kross-interpreters-snapshot-20110615.tar.gz
-/kimono-4.6.90.tar.bz2
-/korundum-4.6.90.tar.bz2
-/perlkde-4.6.90.tar.bz2
-/perlqt-4.6.90.tar.bz2
-/pykde4-4.6.90.tar.bz2
-/qtruby-4.6.90.tar.bz2
-/qyoto-4.6.90.tar.bz2
-/smokegen-4.6.90.tar.bz2
-/smokekde-4.6.90.tar.bz2
-/smokeqt-4.6.90.tar.bz2
-/kross-interpreters-4.6.90.tar.bz2
+/kimono-4.6.95.tar.bz2
+/korundum-4.6.95.tar.bz2
+/kross-interpreters-4.6.95.tar.bz2
+/perlkde-4.6.95.tar.bz2
+/perlqt-4.6.95.tar.bz2
+/qtruby-4.6.95.tar.bz2
+/qyoto-4.6.95.tar.bz2
+/smokegen-4.6.95.tar.bz2
+/smokekde-4.6.95.tar.bz2
+/smokeqt-4.6.95.tar.bz2
diff --git a/kdebindings-4.6.90-packaging_cmake.patch b/kdebindings-4.6.90-packaging_cmake.patch
index 3c68947..684806a 100644
--- a/kdebindings-4.6.90-packaging_cmake.patch
+++ b/kdebindings-4.6.90-packaging_cmake.patch
@@ -1,13 +1,15 @@
 diff -up kdebindings-4.6.90/CMakeLists.txt.packaging_cmake kdebindings-4.6.90/CMakeLists.txt
 --- kdebindings-4.6.90/CMakeLists.txt.packaging_cmake	2011-06-30 14:55:15.976627221 +0200
-+++ kdebindings-4.6.90/CMakeLists.txt	2011-06-30 15:16:32.768436344 +0200
-@@ -0,0 +1,17 @@
++++ kdebindings-4.6.90/CMakeLists.txt	2011-06-30 15:44:36.976169764 +0200
+@@ -0,0 +1,19 @@
 +project(kdebindings)
 +
 +find_package(KDE4 REQUIRED)
 +include(KDE4Defaults)
 +include(MacroLibrary)
 +
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/generator/cmake )
++
 +add_subdirectory(generator)
 +
 +macro_optional_add_subdirectory(smoke)
diff --git a/kdebindings.spec b/kdebindings.spec
index c8a9500..115e9c3 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -17,9 +17,6 @@
 %endif
 
 %define devel 1
-%define pykde4_akonadi 1
-%define pyqt4_version_min 4.8.2
-%define sip_version_min 4.12
 
 %if 0%{?rhel}
 %define falcon 0
@@ -39,7 +36,7 @@
 %global _cmake_skip_rpath %{nil}
 
 Name: kdebindings
-Version: 4.6.90
+Version: 4.6.95
 Release: 1%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -51,7 +48,6 @@ Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kimono-%{version}.tar.b
 Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/korundum-%{version}.tar.bz2
 Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/perlkde-%{version}.tar.bz2
 Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/perlqt-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/pykde4-%{version}.tar.bz2
 Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/qtruby-%{version}.tar.bz2
 Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/qyoto-%{version}.tar.bz2
 Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/smokegen-%{version}.tar.bz2
@@ -82,14 +78,6 @@ BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  kdesdk-devel >= %{version}
 BuildRequires:  polkit-qt-devel
 BuildRequires:  python-devel
-BuildRequires:  PyQt4-devel >= %{pyqt4_version_min}, sip-devel >= %{sip_version_min}
-%if 0%{?python3}
-BuildRequires:  python3-devel
-BuildRequires:  python3-PyQt4-devel >= %{pyqt4_version_min}, python3-sip-devel >= %{sip_version_min}
-%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")
-%global python3_ver %(%{__python3} -c "import sys ; print (\\"%s%s\\" % (sys.version[:3],getattr(sys,'abiflags','')))")
-%global python3_pyqt4_version %(%{__python3} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min})
-%endif
 BuildRequires:  qimageblitz-devel
 %if 0%{?fedora}
 BuildRequires:  qscintilla-devel >= 2.4
@@ -134,69 +122,6 @@ Obsoletes:      kdebindings-devel < %{version}-%{release}
 %description
 KDE bindings to non-C++ languages
 
-%package -n PyKDE4
-Group:    Development/Languages
-Summary:  Python bindings for KDE4
-Requires: kdelibs4 >= %{version}
-%global pyqt4_version %(%{__python} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min})
-Requires: PyQt4 >= %{pyqt4_version}
-%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-%if ! 0%{?pykde4_akonadi}
-Provides: PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
-%endif
-%description -n PyKDE4
-%{summary}.
-
-%package -n PyKDE4-akonadi
-Summary: Akonadi runtime support for PyKDE4 
-Group: Development/Languages 
-Requires: PyKDE4 = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version} 
-%description -n PyKDE4-akonadi 
-%{summary}.
-
-%package -n PyKDE4-devel
-Group:    Development/Languages
-Summary:  Files needed to build PyKDE4-based applications
-Requires: PyQt4-devel
-Requires: PyKDE4 = %{version}-%{release}
-%if 0%{?pykde4_akonadi}
-Requires: PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-%endif
-%description -n PyKDE4-devel
-%{summary}.
-
-%package -n python3-PyKDE4
-Summary: Python 3 bindings for KDE 
-Group:   Development/Languages
-Requires: python3-PyQt4 >= %{python3_pyqt4_version}
-%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
-%if ! 0%{?pykde4_akonadi}
-Provides: python3-PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
-%endif
-%description -n python3-PyKDE4
-%{summary}.
-
-%package -n python3-PyKDE4-akonadi
-Summary: Akonadi runtime support for PyKDE4
-Group: Development/Languages
-Requires: python3-PyKDE4 = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
-%description -n python3-PyKDE4-akonadi
-%{summary}.
-
-%package -n python3-PyKDE4-devel
-Group:    Development/Languages
-Summary:  Files needed to build PyKDE4-based applications
-Requires: python3-PyQt4-devel
-Requires: python3-PyKDE4 = %{version}-%{release}
-%if 0%{?pykde4_akonadi}
-Requires: python3-PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-%endif
-%description -n python3-PyKDE4-devel
-%{summary}.
 
 %package devel
 Group:    Development/Libraries
@@ -351,9 +276,6 @@ mkdir -p perl/qt
 mv perlqt-%{version}/* perl/qt && rmdir perlqt-%{version}
 
 # python
-%setup -q -T -D -a 5
-mkdir -p python/pykde4
-mv -f pykde4-%{version}/* python/pykde4 && rmdir pykde4-%{version}
 mkdir -p python/krosspython
 mv -f kross-interpreters-%{version}/python/* python/krosspython
 
@@ -386,30 +308,6 @@ rmdir --ignore-fail-on-non-empty kross-interpreters-%{version}
 
 
 %build
-%if 0%{?python3}
-mkdir -p %{_target_platform}-python3
-pushd    %{_target_platform}-python3
-%{cmake_kde4} \
-  -DPYTHON_EXECUTABLE:PATH=%{__python3} \
-  -DPython_ADDITIONAL_VERSIONS=%{python3_ver} \
-  -DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_ver}.so.1.0 \
-  -DPYTHON_LIBRARIES=%{_libdir}/libpython%{python3_ver}.so.1.0 \
-  -DPYTHON_INCLUDE_PATH=%{_includedir}/python%{python3_ver} \
-  -DENABLE_KROSSPYTHON:BOOL=OFF \
-  -DENABLE_QYOTO:BOOL=OFF \
-  -DBUILD_csharp:BOOL=OFF \
-  -DBUILD_falcon:BOOL=OFF \
-  -DBUILD_php:BOOL=OFF \
-  -DBUILD_ruby:BOOL=OFF \
-  -DBUILD_smoke:BOOL=OFF \
-  -DBUILD_java:BOOL=OFF \
-  -DBUILD_perl:BOOL=OFF \
-  ..
-
-make %{?_smp_mflags} -C python/
-popd
-%endif
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
@@ -458,39 +356,8 @@ popd
 %install
 rm -rf %{buildroot}
 
-%if 0%{?python3}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-python3/python/
-
-# not python3 compat yet
-rm -fv %{buildroot}%{_kde4_libdir}/kde4/kpythonpluginfactory.so 
-
-# HACK: fix multilib conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
-rm -fv %{buildroot}%{_bindir}/pykdeuic4
-mv %{buildroot}%{python3_sitearch}/PyQt4/uic/pykdeuic4.py \
-   %{buildroot}%{_bindir}/python3-pykdeuic4
-ln -s %{_bindir}/python3-pykdeuic4 \
-      %{buildroot}%{python3_sitearch}/PyQt4/uic/pykdeuic4.py
-
-# install pykde4 examples under correct dir
-mkdir -p %{buildroot}%{_docdir}
-rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
-mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/python3-pykde4
-%endif
-
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# HACK: fix multilib conflict, similar to PyQt4's http://bugzilla.redhat.com/509415
-rm -fv %{buildroot}%{_bindir}/pykdeuic4
-mv %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py \
-   %{buildroot}%{_bindir}/pykdeuic4
-ln -s %{_bindir}/pykdeuic4 \
-      %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
-
-# install pykde4 examples under correct dir
-mkdir -p %{buildroot}%{_docdir}
-rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
-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
@@ -532,51 +399,6 @@ rm -rf %{buildroot}
 %{_includedir}/smokegen/
 %endif
 
-%files -n PyKDE4
-%defattr(-,root,root,-)
-%doc COPYING
-%{python_sitearch}/PyKDE4/
-%{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
-%dir %{_docdir}/pykde4
-%{_kde4_libdir}/kde4/kpythonpluginfactory.so
-
-%if 0%{?pykde4_akonadi}
-%exclude %{python_sitearch}/PyKDE4/akonadi.so
-%files -n PyKDE4-akonadi
-%defattr(-,root,root,-)
-%{python_sitearch}/PyKDE4/akonadi.so
-%endif
-
-%files -n PyKDE4-devel
-%defattr(-,root,root,-)
-%{_kde4_bindir}/pykdeuic4
-%{python_sitearch}/PyQt4/uic/pykdeuic4.py*
-%{_docdir}/pykde4/examples/
-%{_kde4_datadir}/sip/PyKDE4/
-
-%if 0%{?python3}
-%files -n python3-PyKDE4
-%defattr(-,root,root,-)
-%doc COPYING
-%{python3_sitearch}/PyKDE4/
-%{python3_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
-%dir %{_docdir}/python3-pykde4
-
-%if 0%{?pykde4_akonadi}
-%exclude %{python3_sitearch}/PyKDE4/akonadi.so
-%files -n python3-PyKDE4-akonadi
-%defattr(-,root,root,-)
-%{python3_sitearch}/PyKDE4/akonadi.so
-%endif
-
-%files -n python3-PyKDE4-devel
-%defattr(-,root,root,-)
-%{_kde4_bindir}/python3-pykdeuic4
-%{python3_sitearch}/PyQt4/uic/pykdeuic4.py*
-%{_docdir}/python3-pykde4/examples/
-%{_kde4_datadir}/python3-sip/PyKDE4/
-%endif
-
 %if 0%{?csharp}
 %files -n kimono
 %defattr(-,root,root,-)
@@ -731,6 +553,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 11 2011 Jaroslav Reznik <jreznik at redhat.com> - 4.6.95-1
+- 4.6.95 (rc2)
+- PyKDE4 is now in standalone package
+
 * Mon Jun 27 2011 Than Ngo <than at redhat.com> - 4.6.90-1
 - 4.6.90 (rc1)
 
diff --git a/sources b/sources
index 24af53e..c39bce6 100644
--- a/sources
+++ b/sources
@@ -1,11 +1,10 @@
-bdeb01eaf4256944ff22fcc45436df65  kimono-4.6.90.tar.bz2
-28faac3de0181f32d6c8f2ca90c313dd  korundum-4.6.90.tar.bz2
-df95baea15395381f16ccc1ec59b3e33  perlkde-4.6.90.tar.bz2
-520c6510f86554d81cd3db6674166156  perlqt-4.6.90.tar.bz2
-6b6cf2d53aa0324ab443b887b08a8410  pykde4-4.6.90.tar.bz2
-45c4662de20563f01e8665c312c2c968  qtruby-4.6.90.tar.bz2
-e25dd296b8b93e479bc54844616c751b  qyoto-4.6.90.tar.bz2
-f6c9cc1af95b8ba1f9105afd0c5446f3  smokegen-4.6.90.tar.bz2
-dbcf63ee9b88d61ee9fb172a5cb594fd  smokekde-4.6.90.tar.bz2
-8421320d033a0b53bf1c469710142e16  smokeqt-4.6.90.tar.bz2
-6d071c2648e96b788f871b4ab9385798  kross-interpreters-4.6.90.tar.bz2
+b157728e7f322fd028100d997a0942d7  kimono-4.6.95.tar.bz2
+9fcc0343f6221259e886772b956e5736  korundum-4.6.95.tar.bz2
+3050eb299dbc665775e394ab8e536972  kross-interpreters-4.6.95.tar.bz2
+ee43224f589917d9ccf60ade2c81c68d  perlkde-4.6.95.tar.bz2
+cb98d43c20213582f24781b1f83121cf  perlqt-4.6.95.tar.bz2
+ecf503559249cdbefa3984de02750ca5  qtruby-4.6.95.tar.bz2
+f6aa6fd5e6cf7bd06ea7831ffc6e3b46  qyoto-4.6.95.tar.bz2
+dd8dc0f9fb8e2fe5294075855be524a4  smokegen-4.6.95.tar.bz2
+dba7040258f6837ad5db92c59ac6ee25  smokekde-4.6.95.tar.bz2
+113fa28ba37f778a0be048fae603cbb2  smokeqt-4.6.95.tar.bz2

More information about the scm-commits mailing list