Hello community,
here is the log from the commit of package kdeedu4
checked in at Fri Jul 11 02:21:23 CEST 2008.
--------
--- KDE/kdeedu4/kdeedu4.changes 2008-07-01 13:17:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2008-07-07 14:24:36.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Jul 7 14:23:27 CEST 2008 - dmueller@suse.de
+
+- fix kde4-marble maps packaging error
+
+-------------------------------------------------------------------
+Fri Jul 4 00:20:23 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.85
+
+-------------------------------------------------------------------
kdeedu4-noarch.changes: same change
Old:
----
kdeedu-4.0.84.tar.bz2
New:
----
kdeedu-4.0.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeedu4-noarch.spec ++++++
--- /var/tmp/diff_new_pack.vi8474/_old 2008-07-11 02:20:58.000000000 +0200
+++ /var/tmp/diff_new_pack.vi8474/_new 2008-07-11 02:20:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeedu4-noarch (Version 4.0.84)
+# spec file for package kdeedu4-noarch (Version 4.0.85)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
Group: System/GUI/KDE
Summary: General Data for KDE Education Applications
Url: http://edu.kde.org
-Version: 4.0.84
-Release: 4
+Version: 4.0.85
+Release: 1
Source0: kdeedu-%version.tar.bz2
Source1: _upstream
Patch0: 4_1_BRANCH.diff
@@ -45,10 +45,16 @@
%build
%cmake_kde4 -d build
+ pushd marble/src/tilecreator
+ %make_jobs
+ popd
%install
- cd build/marble/data
+ for d in build/marble/data build/marble/src/tilecreator; do
+ pushd $d
%makeinstall
+ popd
+ done
rm $RPM_BUILD_ROOT/usr/share/icons/hicolor/*/apps/marble.*
%if 0
cd ../../kstars/kstars
@@ -59,8 +65,10 @@
cd ../..
%create_exclude_filelist
%if %suse_version > 1020
- %fdupes -s $RPM_BUILD_ROOT
+ %fdupes -s $RPM_BUILD_ROOT/usr/share
%endif
+ # some crap from marble
+ rm -rf $RPM_BUILD_ROOT/usr/bin
%clean
rm -rf $RPM_BUILD_ROOT
@@ -114,6 +122,10 @@
%doc COPYING COPYING.DOC README
%changelog
+* Mon Jul 07 2008 dmueller@suse.de
+- fix kde4-marble maps packaging error
+* Fri Jul 04 2008 dmueller@suse.de
+- update to 4.0.85
* Tue Jul 01 2008 dmueller@suse.de
- fix filelist again
* Tue Jul 01 2008 dmueller@suse.de
++++++ kdeedu4.spec ++++++
--- /var/tmp/diff_new_pack.vi8474/_old 2008-07-11 02:20:58.000000000 +0200
+++ /var/tmp/diff_new_pack.vi8474/_new 2008-07-11 02:20:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeedu4 (Version 4.0.84)
+# spec file for package kdeedu4 (Version 4.0.85)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,8 +11,12 @@
Name: kdeedu4
-BuildRequires: boost-devel freeglut-devel kdebase4-workspace-devel libeigen ocaml
-BuildRequires: libopenbabel-devel ocaml-facile readline-devel
+BuildRequires: boost-devel freeglut-devel kdebase4-workspace-devel libeigen
+BuildRequires: libopenbabel-devel readline-devel
+# currently in DOESNOTBUILD (2008-07-03)
+%ifnarch ppc ppc64
+BuildRequires: ocaml ocaml-facile
+%endif
%if 0
#arch %ix86
#BuildRequires: sbig
@@ -24,8 +28,8 @@
Group: System/GUI/KDE
Summary: General Data for KDE Education Applications
Url: http://edu.kde.org
-Version: 4.0.84
-Release: 3
+Version: 4.0.85
+Release: 1
Source0: kdeedu-%version.tar.bz2
Source1: _upstream
Patch0: 4_1_BRANCH.diff
@@ -657,6 +661,10 @@
%doc %lang(en) /usr/share/doc/kde/HTML/en/step
%changelog
+* Mon Jul 07 2008 dmueller@suse.de
+- fix kde4-marble maps packaging error
+* Fri Jul 04 2008 dmueller@suse.de
+- update to 4.0.85
* Tue Jul 01 2008 dmueller@suse.de
- fix filelist again
* Tue Jul 01 2008 dmueller@suse.de
++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.vi8474/_old 2008-07-11 02:20:58.000000000 +0200
+++ /var/tmp/diff_new_pack.vi8474/_new 2008-07-11 02:20:58.000000000 +0200
@@ -1,7 +1,111 @@
-package: kdeedu-4.0.82.tar.bz2
+package: kdeedu-4.0.85.tar.bz2
kdemod: kdeedu
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD:
-+svn di between //trunk/KDE/kdeedu@819047 and //trunk/KDE/kdeedu
++current HEAD: 827929
++svn di between //trunk/KDE/kdeedu@827473 and //trunk/KDE/kdeedu
+--- marble/src/lib/GeoPolygon.h
++++ marble/src/lib/GeoPolygon.h
+@@ -16,6 +16,7 @@
+ #include