commit koffice2 for openSUSE:Factory
Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Mon May 25 01:01:50 CEST 2009. -------- --- KDE/koffice2/koffice2.changes 2009-04-06 14:30:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/koffice2/koffice2.changes 2009-05-22 15:12:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 22 11:22:41 CEST 2009 - beineri@opensuse.org + +- update to KOffice 2.0 release + +------------------------------------------------------------------- koffice2-doc.changes: same change calling whatdependson for head-i586 Old: ---- koffice-1.9.99.0.tar.bz2 New: ---- koffice-2.0.0.tar.bz2 kplato.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.N14661/_old 2009-05-25 01:01:30.000000000 +0200 +++ /var/tmp/diff_new_pack.N14661/_new 2009-05-25 01:01:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package koffice2-doc (Version 1.9.99.0) +# spec file for package koffice2-doc (Version 2.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: Productivity/Office/Suite Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org -Version: 1.9.99.0 +Version: 2.0.0 Release: 1 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,8 +61,6 @@ %defattr(-,root,root) %doc COPYING COPYING.LIB README %doc %lang(en) /usr/share/doc/kde/HTML/en/kchart -%exclude %doc %lang(en) /usr/share/doc/kde/HTML/en/kformula -%exclude %doc %lang(en) /usr/share/doc/kde/HTML/en/kivio %doc %lang(en) /usr/share/doc/kde/HTML/en/koffice %doc %lang(en) /usr/share/doc/kde/HTML/en/kplato %doc %lang(en) /usr/share/doc/kde/HTML/en/kpresenter @@ -73,6 +71,8 @@ %doc %lang(en) /usr/share/doc/kde/HTML/en/karbon %changelog +* Fri May 22 2009 beineri@opensuse.org +- update to KOffice 2.0 release * Mon Apr 06 2009 wstephenson@suse.de - update to KOffice 2.0 RC 1 (1.9.99.0): http://koffice.org/announcements/changelog-2.0-rc1.php ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.N14661/_old 2009-05-25 01:01:30.000000000 +0200 +++ /var/tmp/diff_new_pack.N14661/_new 2009-05-25 01:01:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package koffice2 (Version 1.9.99.0) +# spec file for package koffice2 (Version 2.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz libexif libkdepimlibs4-devel BuildRequires: libpoppler-qt4-devel libpqxx-devel libqt4-devel-doc mysql-devel postgresql-devel python-devel BuildRequires: GraphicsMagick-devel gsl-devel libwpd-devel readline-devel ruby-devel sqlite-devel wv2-devel -BuildRequires: libeigen2-devel libexiv2-devel libqca2-devel libqimageblitz-devel pstoedit +BuildRequires: glew-devel libeigen2-devel libexiv2-devel libgmm++-devel libqca2-devel libqimageblitz-devel pstoedit %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -29,12 +29,13 @@ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org -Version: 1.9.99.0 +Version: 2.0.0 Release: 1 Source0: koffice-%version.tar.bz2 Patch: desktop-files.diff Patch1: koffice_remove_kohyphen.diff Patch2: koffice_remove_python_shebangs.diff +Patch3: kplato.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -58,8 +59,9 @@ %prep %setup -q -n koffice-%version %patch -%patch1 -%patch2 +#%patch1 +#%patch2 +%patch3 %build %cmake_kde4 -d build @@ -829,8 +831,13 @@ /usr/share/icons/oxygen/*/actions/object-ungroup-koffice.* /usr/share/kde4/apps/koffice/icons/hicolor/*/actions/aoleft.* /usr/share/kde4/apps/koffice/icons/hicolor/*/actions/music-rest-128th.* +/usr/share/kde4/apps/koffice/icons/hicolor/*/actions/artistictext-attach-path.* +/usr/share/kde4/apps/koffice/icons/hicolor/*/actions/artistictext-detach-path.* +/usr/share/kde4/apps/koffice/icons/hicolor/*/actions/artistictext-tool.* %changelog +* Fri May 22 2009 beineri@opensuse.org +- update to KOffice 2.0 release * Mon Apr 06 2009 wstephenson@suse.de - update to KOffice 2.0 RC 1 (1.9.99.0): http://koffice.org/announcements/changelog-2.0-rc1.php ++++++ koffice-1.9.99.0.tar.bz2 -> koffice-2.0.0.tar.bz2 ++++++ KDE/koffice2/koffice-1.9.99.0.tar.bz2 /mounts/work_src_done/STABLE/koffice2/koffice-2.0.0.tar.bz2 differ: byte 11, line 1 ++++++ kplato.diff ++++++ diff -ru koffice-2.0.0-old//kplato/kptaboutdata.h koffice-2.0.0/kplato/kptaboutdata.h --- kplato/kptaboutdata.h 2009-05-20 09:26:59.000000000 +0200 +++ kplato/kptaboutdata.h 2009-05-22 14:14:33.000000000 +0200 @@ -28,7 +28,7 @@ { static const char* KPLATO_DESCRIPTION=I18N_NOOP("KPlato - KDE Planning Tool"); -static const char* KPLATO_VERSION="0.6.99"; +static const char* KPLATO_VERSION="0.7.0"; KAboutData * newAboutData() { diff -ru koffice-2.0.0-old//kplato/libs/kernel/kptproject.cpp koffice-2.0.0/kplato/libs/kernel/kptproject.cpp --- kplato/libs/kernel/kptproject.cpp 2009-05-20 09:26:51.000000000 +0200 +++ kplato/libs/kernel/kptproject.cpp 2009-05-22 14:15:03.000000000 +0200 @@ -1005,7 +1005,8 @@ Resource *Project::takeResource( ResourceGroup *group, Resource *resource ) { emit resourceToBeRemoved( resource ); - Q_ASSERT( removeResourceId( resource->id() ) == true ); + bool result = removeResourceId( resource->id() ); + Q_ASSERT( result == true ); resource->removeRequests(); // not valid anymore Resource *r = group->takeResource( resource ); Q_ASSERT( resource == r ); diff -ru koffice-2.0.0-old//kplato/libs/kernel/kptschedule.cpp koffice-2.0.0/kplato/libs/kernel/kptschedule.cpp --- kplato/libs/kernel/kptschedule.cpp 2009-05-20 09:26:51.000000000 +0200 +++ kplato/libs/kernel/kptschedule.cpp 2009-05-22 14:15:03.000000000 +0200 @@ -837,8 +837,10 @@ return ; } a = new Appointment( this, node, start, end, load ); - Q_ASSERT ( add( a ) == true ); - Q_ASSERT ( node->add( a ) == true ); + bool result = add( a ); + Q_ASSERT ( result == true ); + result = node->add( a ); + Q_ASSERT ( result == true ); //kDebug()<<"Added interval to new"<
participants (1)
-
root@Hilbert.suse.de