Hello community,
here is the log from the commit of package kdeedu4
checked in at Thu Aug 9 16:42:09 CEST 2007.
--------
--- KDE/kdeedu4/kdeedu4.changes 2007-07-29 04:31:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeedu4/kdeedu4.changes 2007-08-09 10:10:17.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 9 10:09:28 CEST 2007 - stbinner@suse.de
+
+- update to 3.92.0.svn697375
+- fix file conflict
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeedu4.spec ++++++
--- /var/tmp/diff_new_pack.bh4705/_old 2007-08-09 16:35:23.000000000 +0200
+++ /var/tmp/diff_new_pack.bh4705/_new 2007-08-09 16:35:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeedu4 (Version 3.92.0)
+# spec file for package kdeedu4 (Version 3.92.0.svn697375)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
%endif
%if 0
#arch %ix86
-BuildRequires: sbig
+#BuildRequires: sbig
%endif
%if %suse_version > 1020
BuildRequires: fdupes
@@ -25,7 +25,7 @@
Group: System/GUI/KDE
Summary: General Data for KDE Education Applications
URL: http://edu.kde.org
-Version: 3.92.0
+Version: 3.92.0.svn697375
Release: 1
Source0: kdeedu.tar.bz2
Source1: _upstream
@@ -64,7 +64,7 @@
The KDE Team
%prep
-%setup -q -n kdeedu-3.92.0
+%setup -q -n kdeedu
%patch
%build
@@ -96,6 +96,8 @@
%if %suse_version > 1020
%fdupes -s $RPM_BUILD_ROOT
%endif
+ # no conflict with sbig package
+ rm $RPM_BUILD_ROOT/usr/%_lib/libsbigudrv.*
%post -p /sbin/ldconfig
@@ -127,10 +129,10 @@
%files -n libkdeedu4
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-/usr/%_lib/libkdeeducore.so.*
/usr/%_lib/libkdeeduui.so.*
/usr/%_lib/libextdate.so.*
/usr/%_lib/libscience.so.*
+/usr/%_lib/libkeduvocdocument.so.*
%if 0%{?kde_kde4}
/usr/%_lib/libcompoundviewer.so.*
%endif
@@ -158,9 +160,9 @@
/usr/%_lib/libcompoundviewer.so
%endif
/usr/%_lib/libextdate.so
-/usr/%_lib/libkdeeducore.so
/usr/%_lib/libkdeeduui.so
/usr/%_lib/libscience.so
+/usr/%_lib/libkeduvocdocument.so
%package -n kde4-blinken
Group: Amusements/Games/Other
Summary: Simon Says Game
@@ -219,6 +221,7 @@
%doc COPYING COPYING-DOCS README
/usr/bin/marble
/usr/%_lib/libmarblewidget.so
+/usr/%_lib/libmarblewidget.so.*
/usr/share/applications/kde4/marble.desktop
%_kde_share_dir/apps/marble
@@ -273,7 +276,6 @@
%doc COPYING COPYING-DOCS README
/usr/bin/kalzium
/usr/share/applications/kde4/kalzium.desktop
-%config %_kde_config_dir/kalzium.knsrc
%if 0%{?kde_kde4}
/usr/%_lib/kde4/plugins/designer/kalziumuiwidgets.so
%endif
@@ -416,7 +418,6 @@
%_kde_share_dir/config.kcfg/kgeography.kcfg
%doc %lang(en) /usr/share/doc/HTML/en/kgeography
-/usr/share/icons/crystalsvg/*/apps/kgeography.*
/usr/share/icons/hicolor/*/apps/kgeography.*
%package -n kde4-khangman
Group: Amusements/Teaching/Language
@@ -656,18 +657,18 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
/usr/bin/kstars
-/usr/bin/celestrongps
-/usr/bin/flipdf
-/usr/bin/fliwheel
/usr/bin/indiserver
-/usr/bin/intelliscope
-/usr/bin/lx200basic
-/usr/bin/lx200generic
-/usr/bin/orionatlas
-/usr/bin/robofocus
-/usr/bin/skycommander
-/usr/bin/temma
-/usr/bin/trutechwheel
+/usr/bin/indi_celestron_gps
+/usr/bin/indi_fli_pdf
+/usr/bin/indi_fli_wheel
+/usr/bin/indi_intelliscope
+/usr/bin/indi_lx200basic
+/usr/bin/indi_lx200generic
+/usr/bin/indi_orion_atlas
+/usr/bin/indi_robofocus
+/usr/bin/indi_skycommander
+/usr/bin/indi_temma
+/usr/bin/indi_trutech_wheel
/usr/share/applications/kde4/kstars.desktop
%_kde_share_dir/apps/kstars
@@ -678,7 +679,7 @@
%doc %lang(en) /usr/share/doc/HTML/en/kstars
/usr/share/icons/hicolor/*/apps/kstars.*
/usr/%_lib/libSatLib.*
-/usr/%_lib/libsbigudrv.*
+#/usr/%_lib/libsbigudrv.*
%package -n kde4-ktouch
Group: Amusements/Teaching/Other
Summary: Touch Typing Tutor
@@ -817,6 +818,9 @@
%_kde_share_dir/apps/libkdeedu
%changelog
+* Thu Aug 09 2007 - stbinner@suse.de
+- update to 3.92.0.svn697375
+- fix file conflict
* Sun Jul 29 2007 - stbinner@suse.de
- update to KDE 4.0 Beta 1
* Thu Jul 12 2007 - stbinner@suse.de
++++++ kdeedu.tar.bz2 ++++++
KDE/kdeedu4/kdeedu.tar.bz2 /mounts/work_src_done/STABLE/kdeedu4/kdeedu.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org