[kdeedu] First attempt on 4.6.80 merged from separated tarballs
Radek Novacek
rnovacek at fedoraproject.org
Mon Jun 13 16:09:47 UTC 2011
commit 2e0fbeefca84dc0b991e126c5efc979a30231fc1
Author: Radek Novacek <rad.n at centrum.cz>
Date: Mon Jun 13 18:09:30 2011 +0200
First attempt on 4.6.80 merged from separated tarballs
.gitignore | 21 +++++++++++
kdeedu.spec | 113 +++++++++++++++++++++++++++++++++++++++++++++++------------
sources | 21 +++++++++++
3 files changed, 132 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f384c3e..27ff89a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,24 @@
/kdeedu-4.6.2.tar.bz2
/marble-1.1.0-source.tar.gz
/kdeedu-4.6.3.tar.bz2
+/blinken-4.6.80.tar.bz2
+/cantor-4.6.80.tar.bz2
+/kalgebra-4.6.80.tar.bz2
+/kalzium-4.6.80.tar.bz2
+/kanagram-4.6.80.tar.bz2
+/kbruch-4.6.80.tar.bz2
+/kgeography-4.6.80.tar.bz2
+/khangman-4.6.80.tar.bz2
+/kig-4.6.80.tar.bz2
+/kiten-4.6.80.tar.bz2
+/klettres-4.6.80.tar.bz2
+/kmplot-4.6.80.tar.bz2
+/kstars-4.6.80.tar.bz2
+/ktouch-4.6.80.tar.bz2
+/kturtle-4.6.80.tar.bz2
+/kwordquiz-4.6.80.tar.bz2
+/libkdeedu-4.6.80.tar.bz2
+/marble-4.6.80.tar.bz2
+/parley-4.6.80.tar.bz2
+/rocs-4.6.80.tar.bz2
+/step-4.6.80.tar.bz2
diff --git a/kdeedu.spec b/kdeedu.spec
index 8c996bd..3050487 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -7,18 +7,43 @@
Name: kdeedu
Summary: Educational/Edutainment applications
-Version: 4.6.3
+Version: 4.6.80
Release: 1%{?dist}
License: GPLv2
Group: Amusements/Games
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
-# interim Marble release (Marble 1.1.0)
-%global marblever 1.1.0
-Source1: http://files.kde.org/marble/downloads/sources/marble-%{marblever}-source.tar.gz
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/libkdeedu-%{version}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/blinken-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/cantor-%{version}.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kalgebra-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kalzium-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kanagram-%{version}.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kbruch-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kgeography-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/khangman-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kig-%{version}.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kiten-%{version}.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/klettres-%{version}.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kmplot-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kstars-%{version}.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/ktouch-%{version}.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kturtle-%{version}.tar.bz2
+Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kwordquiz-%{version}.tar.bz2
+Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/marble-%{version}.tar.bz2
+Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/parley-%{version}.tar.bz2
+Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/rocs-%{version}.tar.bz2
+Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/step-%{version}.tar.bz2
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## CMake patches
+
+# find qtmmlwidget library from libkdeedu
+Patch1: kdeedu-4.6.80-kalgebra_cmake.patch
+# fix out of source build
+Patch2: kdeedu-4.6.80-kmplot_cmake.patch
+
## upstreamable patches
## upstream patches
@@ -43,8 +68,8 @@ BuildRequires: gpsd-devel
%endif
BuildRequires: desktop-file-utils
BuildRequires: gsl-devel
-BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: plasma-devel >= %{version}
+#BuildRequires: kdelibs4-devel >= %{version}
+#BuildRequires: plasma-devel >= %{version}
BuildRequires: libspectre-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
@@ -186,27 +211,71 @@ Group: System Environment/Libraries
%prep
-%setup -q -n kdeedu-%{version}%{?alphatag}
-# replace the Marble 1.0.x in kdeedu with 1.1.x
-%setup -q -T -D -a 1 -c -n kdeedu-%{version}%{?alphatag}/marble-%{marblever}
-%setup -q -T -D -n kdeedu-%{version}%{?alphatag}
-rm -rf marble doc/marble
-mv marble-%{marblever} marble
-mv marble/doc doc/marble
+# unpack libkdeedu
+%setup -q -n libkdeedu-%{version}
+# unpack the kdeedu applications
+%setup -q -T -D -c -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -n kdeedu-%{version}%{?alphatag}
+
+%patch1 -p2 -b .kalgebra_cmake
+%patch2 -p2 -b .kmplot_cmake
+
+# create CMakeLists.txt with list of all subdirectories with kdeedu apps
+ls -d */ | sed 's/\(.*\)/add_subdirectory( \1 )/g' > CMakeLists.txt
+
+# create FindLibKdeEdu.cmake which finds locally installed libkdeedu
+cat <<EOF > FindLibKdeEdu.cmake
+FIND_LIBRARY(LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES libkeduvocdocument.so
+ HINTS ../../libkdeedu-%{version}/%{_target_platform}/libkdeedu/usr/
+ PATH_SUFFIXES lib lib64
+)
+FIND_LIBRARY(LIBKDEEDU_QTMMLWIDGET libqtmmlwidget.a
+ HINTS ../../libkdeedu-%{version}/%{_target_platform}/libkdeedu/usr/
+ PATH_SUFFIXES lib lib64
+)
+FIND_PATH(LIBKDEEDU_INCLUDE_DIR keduvocdocument.h
+ HINTS ../../libkdeedu-%{version}/%{_target_platform}/libkdeedu/usr/
+ PATH_SUFFIXES include/kde4/libkdeedu include/kde4 include
+)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibKdeEdu DEFAULT_MSG LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES LIBKDEEDU_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LIBKDEEDU_INCLUDE_DIR LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES)
+EOF
%build
+# build libkdeedu first
+cd ../libkdeedu-%{version}
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
+KDEEDUDIR=`pwd`/libkdeedu
+LIBKDEEDU_DIR=$KDEEDUDIR/usr
+mkdir -p $KDEEDUDIR
popd
make %{?_smp_mflags} -C %{_target_platform}
+# libkdeedu must be installed locally first, some apps depend on it
+make install/fast DESTDIR=$KDEEDUDIR -C %{_target_platform}
+# then build everything else
+cd ../kdeedu-%{version}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} .. -DCMAKE_MODULE_PATH=..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
+# install libkdeedu
+cd ../libkdeedu-%{version}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+# install all kdeedu apps
+cd ../kdeedu-%{version}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# #unpackaged files
@@ -436,10 +505,8 @@ rm -rf %{buildroot}
%files libs
%defattr(-,root,root,-)
-%doc COPYING README
%{_kde4_appsdir}/libkdeedu/
%{_kde4_libdir}/libcompoundviewer.so.4*
-%{_kde4_libdir}/libkdeeduui.so.4*
%{_kde4_libdir}/libkeduvocdocument.so.4*
%{_kde4_libdir}/libkiten.so.4*
%{_kde4_libdir}/libscience.so.4*
@@ -463,19 +530,19 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
-%{_kde4_appsdir}/cmake/modules/FindKDEEdu.cmake
%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
-%{_kde4_appsdir}/cmake/modules/FindMarbleWidget.cmake
%{_kde4_includedir}/libkdeedu/
%{_kde4_includedir}/libkiten/
%{_kde4_includedir}/rocs/
+%{_kde4_includedir}/cantor/
%{_includedir}/marble/
-%{_kde4_libdir}/libkdeedu*.so
%{_kde4_libdir}/libkeduvocdocument.so
%{_kde4_libdir}/libkiten.so
%{_kde4_libdir}/libscience.so
%{_kde4_libdir}/libmarble*.so
%{_kde4_libdir}/librocslib.so
+%{_kde4_libdir}/libqtmmlwidget.a
+%{_kde4_libdir}/cmake/libkdeedu/
%files kstars
%defattr(-,root,root,-)
@@ -489,12 +556,10 @@ rm -rf %{buildroot}
%files kstars-libs
%defattr(-,root,root,-)
-%{_kde4_libdir}/libSatLib.so.*
%files marble
%defattr(-,root,root,-)
%{_kde4_appsdir}/marble/
-%{_kde4_appsdir}/marble_part/
%{_kde4_bindir}/marble
%{_kde4_bindir}/geodatatest
%{_kde4_bindir}/routing-instructions
@@ -568,7 +633,6 @@ rm -rf %{buildroot}
%{_kde4_iconsdir}/hicolor/*/*/sagebackend.*
%{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
%{_kde4_appsdir}/cantor/
-%{_kde4_appsdir}/cantorpart/
%{_kde4_appsdir}/kalgebra/
%{_kde4_appsdir}/katepart/syntax/python-kig.xml
%{_kde4_appsdir}/katepart/syntax/kalgebra.xml
@@ -600,7 +664,6 @@ rm -rf %{buildroot}
%files math-libs
%defattr(-,root,root,-)
-%doc COPYING README
%{_kde4_libdir}/libanalitza.so.*
%{_kde4_libdir}/libanalitzagui.so.*
%{_kde4_libdir}/libcantorlibs.so.*
@@ -609,6 +672,10 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 02 2011 Radek Novacek <rnovacek at redhat.com> - 4.6.80-1
+- 4.6.80
+- Merged from separate tarballs
+
* Fri May 06 2011 Than Ngo <than at redhat.com> - 4.6.3-1
- 4.6.3
diff --git a/sources b/sources
index ea15dc1..2e8515f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,23 @@
4d79beff5d5fb6307431fd471132f0a7 marble-1.1.0-source.tar.gz
259ba3e733fecd145c4389f10bee5ad1 kdeedu-4.6.3.tar.bz2
+d5053ce74e02d4b9fc68562495c4b90c blinken-4.6.80.tar.bz2
+58986b1cacf2429cc4752595258b5d16 cantor-4.6.80.tar.bz2
+32514316ed6ed67ae828902a82f949aa kalgebra-4.6.80.tar.bz2
+616671d90f10385760a07b55375a2def kalzium-4.6.80.tar.bz2
+fda1632ac9f474eb2d18212c43f7211a kanagram-4.6.80.tar.bz2
+d51bd90059f0df453e0b6eea14e2af69 kbruch-4.6.80.tar.bz2
+bac9f5976227c81a85e8d78509502c4a kgeography-4.6.80.tar.bz2
+13efb0f98636c60573bd10ebd81631fd khangman-4.6.80.tar.bz2
+c5f67b442ec5b3e331983d1db7e2ebf0 kig-4.6.80.tar.bz2
+0c38748479ede81e4782ddbca302e97c kiten-4.6.80.tar.bz2
+f125d0d79e7b6bf56b008ca45cce745f klettres-4.6.80.tar.bz2
+22188c5059585c4fa722a78abc89377c kmplot-4.6.80.tar.bz2
+7772d7da731e593b5b1a0f87cee5846f kstars-4.6.80.tar.bz2
+724ad76ef4ad1929e89031df8e87366e ktouch-4.6.80.tar.bz2
+5436397466175e779412195201c5d158 kturtle-4.6.80.tar.bz2
+388040f66a7493eae013e0a1be31e120 kwordquiz-4.6.80.tar.bz2
+1eab4307baa79e2ac15ae710108b01bd libkdeedu-4.6.80.tar.bz2
+c2a4b94215ff37c87a7d5a1be5de180e marble-4.6.80.tar.bz2
+6f98670f8e5a85a1a8ec766ad592aa20 parley-4.6.80.tar.bz2
+c270ec273dad54a6861e39c84474d8fd rocs-4.6.80.tar.bz2
+95b17f65b320e2f4eb542369eb8da453 step-4.6.80.tar.bz2
More information about the scm-commits
mailing list