Hello community, here is the log from the commit of package kdebase3 checked in at Mon Jan 28 16:04:24 CET 2008. -------- --- KDE/kdebase3/kdebase3.changes 2008-01-17 10:54:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2008-01-28 12:06:32.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 28 12:04:32 CET 2008 - stbinner@suse.de + +- fix build against libbeagle 0.3 + +------------------------------------------------------------------- @@ -28 +33 @@ -Fri Nov 16 13:12:13 CET 2007 - dmueller@suse.de +Fri Nov 16 16:22:06 CET 2007 - tpatzig@suse.de @@ -30 +35 @@ -- remove unneeded source file +- fix, no kryptomedia for already decrypted raid devices (#308196) @@ -33 +38 @@ -Fri Nov 16 16:22:06 CET 2007 - tpatzig@suse.de +Fri Nov 16 13:12:13 CET 2007 - dmueller@suse.de @@ -35 +40 @@ -- fix, no kryptomedia for already decrypted raid devices (#308196) +- remove unneeded source file @@ -2243,0 +2249,5 @@ +Wed Feb 16 21:49:58 CET 2005 - schwab@suse.de + +- Fix splash configuration in startkde. + +------------------------------------------------------------------- @@ -2260,5 +2269,0 @@ -Wed Feb 16 21:49:58 CET 2005 - schwab@suse.de - -- Fix splash configuration in startkde. - -------------------------------------------------------------------- @@ -2496 +2501 @@ -Wed Sep 29 09:58:37 CEST 2004 - coolo@suse.de +Wed Sep 29 10:18:10 CEST 2004 - adrian@suse.de @@ -2498 +2503 @@ -- hiding the clean button again +- hide second entry for printer management @@ -2501 +2506 @@ -Wed Sep 29 10:18:10 CEST 2004 - adrian@suse.de +Wed Sep 29 09:58:37 CEST 2004 - coolo@suse.de @@ -2503 +2508 @@ -- hide second entry for printer management +- hiding the clean button again @@ -2752,5 +2756,0 @@ -Wed Mar 24 15:30:21 CET 2004 - adrian@suse.de - -- export $KDESU_USER with kdesu session - -------------------------------------------------------------------- @@ -2762,0 +2763,5 @@ +Wed Mar 24 15:30:21 CET 2004 - adrian@suse.de + +- export $KDESU_USER with kdesu session + +------------------------------------------------------------------- New: ---- beagle-0.3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.B10507/_old 2008-01-28 16:03:30.000000000 +0100 +++ /var/tmp/diff_new_pack.B10507/_new 2008-01-28 16:03:30.000000000 +0100 @@ -60,7 +60,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.8 -Release: 41 +Release: 45 %define kde_version 3.5.8 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -213,6 +213,7 @@ Patch225: system-folder_man.diff Patch227: arts-start-on-demand.diff Patch228: media-teardown_crypto.diff +Patch229: beagle-0.3.diff %description This package contains kdebase, one of the basic packages of the K @@ -383,7 +384,11 @@ %package beagle Summary: Beagle dependent plugins for KDE desktop Group: System/GUI/KDE +%if %suse_version > 1030 +Requires: beagle >= 0.3.0 +%else Requires: beagle >= 0.2.4 +%endif %if %suse_version > 1010 Supplements: packageand(kdebase3:beagle) %endif @@ -405,7 +410,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 418 +Release: 422 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -597,6 +602,9 @@ %if %suse_version > 1000 %patch228 %endif +%if %suse_version > 1030 +%patch229 +%endif rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png cp %SOURCE17 l10n/tw/flag.png @@ -1613,6 +1621,8 @@ %endif %changelog +* Mon Jan 28 2008 stbinner@suse.de +- fix build against libbeagle 0.3 * Thu Jan 17 2008 stbinner@suse.de - update 3_5_BRANCH.diff for 64bit Flash fixes * Wed Jan 02 2008 stbinner@suse.de @@ -1754,7 +1764,7 @@ are selected * Thu May 10 2007 stbinner@suse.de - add audit log support to kdm (#263180) -* Thu Apr 26 2007 dmueller@suse.de +* Fri Apr 27 2007 dmueller@suse.de - fix build for 10.3 * Wed Apr 25 2007 stbinner@suse.de - fix build for < 10.2 @@ -1925,7 +1935,7 @@ - fix more shell insertion issues with khelpcenter * Tue Nov 14 2006 ltinkl@suse.cz - fixed #218764 - shell insertion vulnerability in khelpcenter -* Mon Nov 13 2006 dmueller@suse.de +* Tue Nov 14 2006 dmueller@suse.de - update optional kwin diff to add custom start script support (#219020) * Mon Nov 13 2006 dmueller@suse.de @@ -2001,7 +2011,7 @@ * Mon Oct 23 2006 stbinner@suse.de - fix file globbing build - fix build for SUSE < 10.1 -* Sun Oct 22 2006 llunak@suse.cz +* Mon Oct 23 2006 llunak@suse.cz - remove patches disable-kcm-modules.diff and close-use-yast2.diff that made clock applet use yast timezone module - patch KDE clock configuration to integrate better with SUSE @@ -2412,7 +2422,7 @@ * Wed Dec 14 2005 lmuelle@suse.de - Package fileshareset and filesharelist as a separate package named fileshare for post 10.0 products and use %%_bindir as install location. -* Sun Dec 04 2005 lmuelle@suse.de +* Mon Dec 05 2005 lmuelle@suse.de - Revert libsmbclient renameing. * Fri Dec 02 2005 coolo@suse.de - update to 3.5 branch and adapt the patches accordingly @@ -2818,7 +2828,7 @@ - fix hanging kparts using threads (like kaffeine/xine) again * Wed Sep 22 2004 adrian@suse.de - create desktop icons also for root user -* Mon Sep 20 2004 adrian@suse.de +* Tue Sep 21 2004 adrian@suse.de - update to current 3_3_BRANCH * various kio_fish fixes * Mon Sep 20 2004 adrian@suse.de @@ -2941,7 +2951,7 @@ - apply default-fonts.diff again * Sun Mar 21 2004 adrian@suse.de - fix kcontrol yast integration -* Wed Mar 17 2004 adrian@suse.de +* Thu Mar 18 2004 adrian@suse.de - move krandrtray menu entry - move some .desktop files to correct sub package * Wed Mar 17 2004 coolo@suse.de @@ -3055,7 +3065,7 @@ - use 3.1.94, second try tar ball * Mon Dec 01 2003 adrian@suse.de - update to 3.1.94 ( KDE 3.2 beta 2 ) -* Thu Nov 13 2003 adrian@suse.de +* Fri Nov 14 2003 adrian@suse.de - update to new snapshot from 2003102409 - fix kwin startup - add SLP support for ksysguard @@ -3103,7 +3113,7 @@ (#30760) - clean up obsolete/double patch - apply fix from Waldo for the kicker update script (#30767) -* Sun Sep 14 2003 coolo@suse.de +* Mon Sep 15 2003 coolo@suse.de - fixes for suseplugger placement * Sat Sep 13 2003 adrian@suse.de - apply fix from Waldo for editing icon entries in kicker (#30606) @@ -3311,7 +3321,7 @@ * Tue Mar 04 2003 adrian@suse.de - add missing Provides/Obsoletes kdialog - use a better icon for Home directory items -* Sat Mar 01 2003 adrian@suse.de +* Sun Mar 02 2003 adrian@suse.de - update to version 3.1.1 * kwin fixes: don't show toplevel menus for non-active windows. * konq fixes: don't repost data on reload, if url changes @@ -3581,7 +3591,7 @@ - fixing scope of the lib64 patch * Fri Jul 19 2002 adrian@suse.de - do not export KDE_MALLOC anymore -* Thu Jul 18 2002 adrian@suse.de +* Fri Jul 19 2002 adrian@suse.de - fix file list * Wed Jul 17 2002 adrian@suse.de - split samba dependend libs into -samba subpackage @@ -3651,7 +3661,7 @@ - fix ~/.kde2->~/.kde copy routine * Fri Mar 15 2002 ro@suse.de - changed neededforbuild <ssh> to <openssh> -* Sun Mar 10 2002 adrian@suse.de +* Mon Mar 11 2002 adrian@suse.de - fix %%pre install script * Sun Mar 10 2002 adrian@suse.de - update to 3.0rc2 @@ -3732,7 +3742,7 @@ - add some last fixes for kdm (thanks a lot, ossi) - fix ksysguardd start script (kill only, if pid file present) - change koffice icon from unkown->xedit -* Thu Sep 20 2001 adrian@suse.de +* Fri Sep 21 2001 adrian@suse.de - add dcopserver_shutdown from HEAD branch and call it in startkde * Thu Sep 20 2001 adrian@suse.de - add fix for wrong ownership of $HOME/.wmrc @@ -3984,7 +3994,7 @@ a little work on the logo fix rc.config template fix $LANG problem in welcome page startup -* Thu Jan 11 2001 adrian@suse.de +* Fri Jan 12 2001 adrian@suse.de - changed logo changed inactive text color in window header * Thu Jan 11 2001 adrian@suse.de @@ -4031,7 +4041,7 @@ - make symbol labels nicer do not show double icons added rc.config entrys for kdm -* Sun Dec 10 2000 adrian@suse.de +* Mon Dec 11 2000 adrian@suse.de - extend startkde for dvd and cdrecorder added logo background mode changed kicker configuration @@ -4041,7 +4051,7 @@ - fixing startkde and working on the SuSE theme * Wed Dec 06 2000 adrian@suse.de - fixed kde link -* Wed Nov 29 2000 adrian@suse.de +* Thu Nov 30 2000 adrian@suse.de - update to 2.0.1 * Tue Nov 21 2000 ro@suse.de - switch to openmotif ++++++ beagle-0.3.diff ++++++ --- kicker/configure.in.in 2008/01/28 11:03:28 1.1 +++ kicker/configure.in.in 2008/01/28 11:03:45 @@ -42,14 +42,14 @@ AC_SUBST(GLIB_LIBADD) AC_SUBST(GLIB_LDFLAGS) -dnl Check for libbeagle 0.2.0 +dnl Check for libbeagle 0.3.0 # LIBBEAGLE_CFLAGS: cflags for compiling libbeagle dependant sources # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) -LIBBEAGLE_PACKAGES="libbeagle-0.0" -LIBBEAGLE_VERSION="0.2.4" -AC_MSG_CHECKING(for libbeagle-0.2.4 (at least $LIBBEAGLE_VERSION)) +LIBBEAGLE_PACKAGES="libbeagle-1.0" +LIBBEAGLE_VERSION="0.3.0" +AC_MSG_CHECKING(for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)) if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then ++++++ kickoff.diff ++++++ --- /var/tmp/diff_new_pack.B10507/_old 2008-01-28 16:03:37.000000000 +0100 +++ /var/tmp/diff_new_pack.B10507/_new 2008-01-28 16:03:37.000000000 +0100 @@ -891,11 +891,11 @@ + beagle_query_set_max_hits (beagle_query, max_hits_per_source); // this is per source! + + kdDebug () << "Creating query from \"" << query_str << "\"" << endl; -+ for ( QStringList::Iterator it = sources_menu.begin(); it != sources_menu.end(); ++it ) ++ /* for ( QStringList::Iterator it = sources_menu.begin(); it != sources_menu.end(); ++it ) + beagle_query_add_source (beagle_query, g_strdup ((*it).utf8 ())); + + for ( QStringList::Iterator it = types_menu.begin(); it != types_menu.end(); ++it ) -+ beagle_query_add_hit_type (beagle_query, g_strdup ((*it).utf8 ())); ++ beagle_query_add_hit_type (beagle_query, g_strdup ((*it).utf8 ()));*/ + + QStringList query_terms; + QString start_date, end_date; @@ -907,13 +907,13 @@ + else if (key_value_pair.count () == 2) { + QString key = key_value_pair [0].lower (); + QString value = key_value_pair [1]; -+ if (key == "mime") ++ if /*(key == "mime") + beagle_query_add_mime_type (beagle_query, g_strdup (value.utf8 ())); + else if (key == "type") + beagle_query_add_hit_type (beagle_query, g_strdup (value.utf8 ())); + else if (key == "source") + beagle_query_add_source (beagle_query, g_strdup (value.utf8 ())); -+ else if (key == "start") ++ else if */ (key == "start") + start_date = value; + else if (key == "end") + end_date = value; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org