From 9a6e033c0726125d073b50c7f6878e0e0396bb3b Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Jun 27 2011 14:05:04 +0000 Subject: initial try to import demodularized kdebindings --- diff --git a/.gitignore b/.gitignore index 5891692..4923109 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,14 @@ /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 diff --git a/kdebindings-4.6.80-packaging_cmake.patch b/kdebindings-4.6.80-packaging_cmake.patch new file mode 100644 index 0000000..5d85b7c --- /dev/null +++ b/kdebindings-4.6.80-packaging_cmake.patch @@ -0,0 +1,48 @@ +diff -up kdebindings-4.6.80/CMakeLists.txt.packaging_cmake kdebindings-4.6.80/CMakeLists.txt +--- kdebindings-4.6.80/CMakeLists.txt.packaging_cmake 2011-06-27 15:55:33.992857147 +0200 ++++ kdebindings-4.6.80/CMakeLists.txt 2011-06-27 16:03:02.331116064 +0200 +@@ -0,0 +1,13 @@ ++project(kdebindings) ++ ++add_subdirectory(generator) ++ ++macro_optional_add_subdirectory(smoke) ++macro_optional_add_subdirectory(ruby) ++macro_optional_add_subdirectory(python) ++macro_optional_add_subdirectory(csharp) ++macro_optional_add_subdirectory(java) ++macro_optional_add_subdirectory(php) ++macro_optional_add_subdirectory(falcon) ++macro_optional_add_subdirectory(perl) ++macro_optional_add_subdirectory(kross-interpreters) +\ No newline at end of file +diff -up kdebindings-4.6.80/csharp/CMakeLists.txt.packaging_cmake kdebindings-4.6.80/csharp/CMakeLists.txt +--- kdebindings-4.6.80/csharp/CMakeLists.txt.packaging_cmake 2011-06-27 15:46:52.000000000 +0200 ++++ kdebindings-4.6.80/csharp/CMakeLists.txt 2011-06-27 15:53:00.402120169 +0200 +@@ -0,0 +1,2 @@ ++add_subdirectory(qyoto) ++add_subdirectory(kimono) +diff -up kdebindings-4.6.80/perl/CMakeLists.txt.packaging_cmake kdebindings-4.6.80/perl/CMakeLists.txt +--- kdebindings-4.6.80/perl/CMakeLists.txt.packaging_cmake 2011-06-27 15:51:29.700165047 +0200 ++++ kdebindings-4.6.80/perl/CMakeLists.txt 2011-06-27 15:51:29.700165047 +0200 +@@ -0,0 +1,2 @@ ++add_subdirectory(qt) ++add_subdirectory(kde) +diff -up kdebindings-4.6.80/python/CMakeLists.txt.packaging_cmake kdebindings-4.6.80/python/CMakeLists.txt +--- kdebindings-4.6.80/python/CMakeLists.txt.packaging_cmake 2011-06-27 15:51:29.848176471 +0200 ++++ kdebindings-4.6.80/python/CMakeLists.txt 2011-06-27 15:51:29.848176471 +0200 +@@ -0,0 +1,2 @@ ++add_subdirectory(krosspython) ++add_subdirectory(pykde4) +diff -up kdebindings-4.6.80/ruby/CMakeLists.txt.packaging_cmake kdebindings-4.6.80/ruby/CMakeLists.txt +--- kdebindings-4.6.80/ruby/CMakeLists.txt.packaging_cmake 2011-06-27 15:51:29.866177863 +0200 ++++ kdebindings-4.6.80/ruby/CMakeLists.txt 2011-06-27 15:51:29.866177863 +0200 +@@ -0,0 +1,2 @@ ++add_subdirectory(qtruby) ++add_subdirectory(korundum) +diff -up kdebindings-4.6.80/smoke/CMakeLists.txt.packaging_cmake kdebindings-4.6.80/smoke/CMakeLists.txt +--- kdebindings-4.6.80/smoke/CMakeLists.txt.packaging_cmake 2011-06-27 15:51:29.867177933 +0200 ++++ kdebindings-4.6.80/smoke/CMakeLists.txt 2011-06-27 15:51:29.867177933 +0200 +@@ -0,0 +1,2 @@ ++add_subdirectory(qt) ++add_subdirectory(kde) diff --git a/kdebindings.spec b/kdebindings.spec index 06aebbe..7610c03 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -40,8 +40,8 @@ %global _cmake_skip_rpath %{nil} Name: kdebindings -Version: 4.6.3 -Release: 2%{?dist} +Version: 4.6.80 +Release: 1%{?dist} Summary: KDE bindings to non-C++ languages # http://techbase.kde.org/Policies/Licensing_Policy @@ -49,8 +49,28 @@ 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 +Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kimono-%{version}.tar.bz2 +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 +Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/smokekde-%{version}.tar.bz2 +Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/smokeqt-%{version}.tar.bz2 +# unfortunatelly kross interpreters are not officialy released -> git snapshot +# git clone git clone git://anongit.kde.org/kross-interpreters +# git archive --format tar master -o kross-interpreters-snapshot-20110615.tar.gz \ +# --prefix kross-interpreters/ +Source11: kross-interpreters-snapshot-20110615.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## Fedora patches +# try to mimic monolithic kdebindings and build it +Patch1: kdebindings-4.6.80-packaging_cmake.patch + ## upstreamable patches Patch50: kdebindings-4.5.95-valgrind.patch @@ -311,6 +331,48 @@ Falcon plugin for the Kross archtecture in KDE4. %prep %setup -q -n kdebindings-%{version}%{?alphatag} +# try to mimic old kdebindings +# kross interpreters +%setup -q -T -D -a 11 + +# csharp +%setup -q -T -D -a 1 +%setup -q -T -D -a 7 +mv kimono-%{version}/* ./csharp/kimono && rmdir kimono-%{version} +mv qyoto-%{version}/* ./csharp/qyoto && rmdir qyoto-%{version} + +# generator +%setup -q -T -D -a 8 +mv smokegen-%{version}/* ./generator && rmdir smokegen-%{version} + +# perl +%setup -q -T -D -a 3 +%setup -q -T -D -a 4 +mv perlkde-%{version}/* ./perl/kde && rmdir perlkde-%{version} +mv perlqt-%{version}/* ./perl/qt && rmdir perlqt-%{version} + +# python +%setup -q -T -D -a 5 +mv pykde4-%{version}/* ./python/pykde4 && rmdir pykde4-%{version} +mv kross-interpreters/python/* ./python/krosspython + +# ruby +%setup -q -T -D -a 2 +%setup -q -T -D -a 6 +mv korundum-%{version}/* ./ruby/korundum && rmdir korundum-%{version} +mv qtruby-%{version}/* ./ruby/qtruby && rmdir qtruby-%{version} + +# smoke +%setup -q -T -D -a 9 +%setup -q -T -D -a 10 +mv smokekde-%{version}/* ./smoke/kde && rmdir smokekde-%{version} +mv smokeqt-%{version}/* ./smoke/qt && rmdir smokeqt-%{version} + +# java +mv kross-interpreters/java/* ./java + + +%patch1 -p1 -b .packaging_cmake %patch50 -p1 -b .valgrind @@ -660,6 +722,9 @@ rm -rf %{buildroot} %changelog +* Wed Jun 15 2011 Jaroslav Reznik 4.6.80-1 +- 4.6.80 (beta1) + * Sat May 07 2011 Rex Dieter 4.6.3-2 - rebuild (qcsintilla) diff --git a/sources b/sources index 249c8c3..0c45cd7 100644 --- a/sources +++ b/sources @@ -1 +1,12 @@ -085f6497be800adea167addc09b89ccc kdebindings-4.6.3.tar.bz2 +a71b4d6c99e80f59f0b74061a26710b8 kdebindings-4.6.80.tar.bz2 +87bad45c4c69d9e83baeb85aaa8a9c58 kimono-4.6.80.tar.bz2 +e377c776dac5efbb0862833557ba1b21 korundum-4.6.80.tar.bz2 +3b901a70df7b46dbea03a14bde098e32 perlkde-4.6.80.tar.bz2 +a37a2a71c83ce3736a23641cc5a43291 perlqt-4.6.80.tar.bz2 +c6be1f287f5d489ea734e0d2ae1802ec pykde4-4.6.80.tar.bz2 +eb1a996cb66f3744c63f1830f66baff0 qtruby-4.6.80.tar.bz2 +4ccfcca574b6336aa7b4332b2a84876e qyoto-4.6.80.tar.bz2 +e79b00db1bbb41e9e10a116038f1758b smokegen-4.6.80.tar.bz2 +126e3d8c3a63b9579aa1f40e97f81c2b smokekde-4.6.80.tar.bz2 +ea00609186185db71dfda90511eb4ec2 smokeqt-4.6.80.tar.bz2 +013bac6285d36a398773463afd7ead72 kross-interpreters-snapshot-20110615.tar.gz