Hello community, here is the log from the commit of package kerry checked in at Mon Jan 28 16:04:22 CET 2008. -------- --- KDE/kerry/kerry.changes 2007-09-28 11:15:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2008-01-28 11:43:27.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 28 11:43:25 CET 2008 - stbinner@suse.de + +- fix build against libbeagle 0.3 + +------------------------------------------------------------------- New: ---- beagle-0.3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kerry.spec ++++++ --- /var/tmp/diff_new_pack.a11977/_old 2008-01-28 16:04:00.000000000 +0100 +++ /var/tmp/diff_new_pack.a11977/_new 2008-01-28 16:04:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kerry (Version 0.2.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -17,10 +17,15 @@ Summary: Desktop search tool BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.2.2 -Release: 92 +Release: 136 Source: %{name}-%{version}.tar.bz2 +%if %suse_version > 1030 +Requires: beagle >= 0.3.0 +Requires: libbeagle1 >= 0.3.0 +%else Requires: beagle >= 0.2.6 Requires: libbeagle >= 0.2.6 +%endif %if %suse_version > 1020 Requires: %{name}-lang = %{version} %endif @@ -28,6 +33,7 @@ Patch2: fix-desktop-file.diff Patch3: new-beagle-autostart.diff Patch4: hu-po.diff +Patch5: beagle-0.3.diff %description A desktop search tool integrated with Beagle and KDE. @@ -49,6 +55,9 @@ %patch3 %endif %patch4 +%if %suse_version > 1030 +%patch5 +%endif . /etc/opt/kde3/common_options update_admin @@ -101,39 +110,42 @@ /opt/kde3/share/autostart/kerry.autostart.desktop %dir /opt/kde3/shutdown /opt/kde3/shutdown/beagled-shutdown.sh + %changelog -* Fri Sep 28 2007 - stbinner@suse.de +* Mon Jan 28 2008 stbinner@suse.de +- fix build against libbeagle 0.3 +* Fri Sep 28 2007 stbinner@suse.de - update Hungarian translation (#174614) -* Thu Sep 20 2007 - stbinner@suse.de +* Thu Sep 20 2007 stbinner@suse.de - adapt Kerry to changed beagled autostart mechanism (#326741) -* Mon Jun 04 2007 - stbinner@suse.de +* Mon Jun 04 2007 stbinner@suse.de - fix build on older distributions -* Sun May 20 2007 - stbinner@suse.de +* Sun May 20 2007 stbinner@suse.de - seperate translations in special package -* Sat May 19 2007 - coolo@suse.de +* Sat May 19 2007 coolo@suse.de - remove X-SuSE-translate from desktop file -* Mon Apr 30 2007 - stbinner@suse.de +* Mon Apr 30 2007 stbinner@suse.de - fix build with desktop-file-validate run -* Fri Feb 09 2007 - stbinner@suse.de +* Fri Feb 09 2007 stbinner@suse.de - expand leading tilde when defining privacy dirs - show Kopete ICQ username instead of UIN - support for Beagle Konversation backend - fix build against SUSE Linux 10.0 -* Thu Jan 18 2007 - stbinner@suse.de +* Thu Jan 18 2007 stbinner@suse.de - add support for Beagle KOrganizer backend (Fate 3591 and 3592) -* Wed Dec 06 2006 - stbinner@suse.de +* Wed Dec 06 2006 stbinner@suse.de - fix check for running beagleindex process -* Fri Nov 24 2006 - stbinner@suse.de +* Fri Nov 24 2006 stbinner@suse.de - revert last change -* Wed Nov 22 2006 - stbinner@suse.de +* Wed Nov 22 2006 stbinner@suse.de - dependency on libbeagle is sufficient -* Mon Nov 20 2006 - stbinner@suse.de +* Mon Nov 20 2006 stbinner@suse.de - update to version 0.2.1: * translation updates * make max needed width of search dialog smaller (#220888) * improve English popup about Beagle cron job (#220752) * show phone numbers in kabc hits -* Mon Nov 06 2006 - stbinner@suse.de +* Mon Nov 06 2006 stbinner@suse.de - update to final version 0.2: * translation updates * nicer info/collapse icons and toolstip for them @@ -144,28 +156,28 @@ * check the age of /tmp/.beagleindexwapi dirs before warning * fix opening of Thunderbird hits * remember which tiles were expanded when rebuilding display -* Thu Oct 26 2006 - stbinner@suse.de +* Thu Oct 26 2006 stbinner@suse.de - hide kcmkerry.desktop from the menu system -* Mon Oct 23 2006 - stbinner@suse.de +* Mon Oct 23 2006 stbinner@suse.de - update to version 0.2 release candidate: * rewrote configuration as kcm modules * support new Beagle backend for KNotes * allow to display all hits at once in listview * require a minimum of 3 chars for search * option to show results as expandable one liners -* Wed Oct 18 2006 - stbinner@suse.de +* Wed Oct 18 2006 stbinner@suse.de - update to svn version: * smaller minimum height * add dcop search call with scope for Kickoff -* Mon Oct 16 2006 - stbinner@suse.de +* Mon Oct 16 2006 stbinner@suse.de - update to svn version: * OR, - and "" for non-Beagle searches/path name filtering * added headers in search sidebar and a "Configure..." button * fix/change again umlaut handling * fix global shortcut handling -* Tue Sep 19 2006 - stbinner@suse.de +* Tue Sep 19 2006 stbinner@suse.de - add "Sort by Type" option -* Mon Sep 18 2006 - stbinner@suse.de +* Mon Sep 18 2006 stbinner@suse.de - update to version 0.2 beta 2: * added sidebar for scope and sorting with date filter * added non-Beagle based KDE addressbook searching @@ -175,78 +187,78 @@ * added tile for "Packages" such as Gentoo Ebuild, RPM, Debian * added "Index data while on battery power" Beagle 0.2.8 setting * made GUI during search non-blocking, add a spinner -* Fri Sep 01 2006 - stbinner@suse.de +* Fri Sep 01 2006 stbinner@suse.de - update from SVN: * icon converted to SVG and revised by Robert Lihm * default just to Alt+Space keyboard shortcut for now * fix preview for URLs with escaped chars within * start beagle daemon by default * fixed a memory leak -* Wed Jun 21 2006 - stbinner@suse.de +* Wed Jun 21 2006 stbinner@suse.de - update to version 0.2 beta * add Beagle backends configuration * add Beagle status / control tab to configuration * rich tooltips for search results (bigger thumbnails etc.) -* Fri May 19 2006 - stbinner@suse.de +* Fri May 19 2006 stbinner@suse.de - try to detect file uris with other encoding (#176053) -* Mon Apr 24 2006 - stbinner@suse.de +* Mon Apr 24 2006 stbinner@suse.de - work around initially shown tips not being properly formatted - beagled.desktop: --autostarted now to be considered harmful -* Tue Apr 18 2006 - stbinner@suse.de +* Tue Apr 18 2006 stbinner@suse.de - fix markup and escaped char errors in 7 translations (#167079) -* Wed Apr 12 2006 - stbinner@suse.de +* Wed Apr 12 2006 stbinner@suse.de - update de, km and pl translations -* Fri Apr 07 2006 - stbinner@suse.de +* Fri Apr 07 2006 stbinner@suse.de - add translations to .desktop files -* Wed Apr 05 2006 - stbinner@suse.de +* Wed Apr 05 2006 stbinner@suse.de - fix dialog maybe not appearing when called from menu (#159317) - don't hardcode hit font point size at all, use KDE setting - fix location of kerry.desktop - updated application icon - add Danish translation -* Fri Mar 31 2006 - stbinner@suse.de +* Fri Mar 31 2006 stbinner@suse.de - fix German translation -* Sat Mar 25 2006 - stbinner@suse.de +* Sat Mar 25 2006 stbinner@suse.de - allow to minimize dialog to fit on 800x600 - increase hit font point size from 8 to 10 - most translations are now complete -* Mon Mar 13 2006 - stbinner@suse.de +* Mon Mar 13 2006 stbinner@suse.de - update from SVN (fixes several bugs) (Bug 157374 - kerry translations (German) partly lacking) (Bug 157372 - kerry crashes when only one result, and result is deleted) (Bug 157371 - Kerry Beagle initial help text is not localized to German yet) -* Tue Mar 07 2006 - stbinner@suse.de +* Tue Mar 07 2006 stbinner@suse.de - update from SVN (drag & context menu changes, more translations) -* Mon Feb 27 2006 - stbinner@suse.de +* Mon Feb 27 2006 stbinner@suse.de - call beagle-shutdown on KDE logout -* Tue Feb 21 2006 - stbinner@suse.de +* Tue Feb 21 2006 stbinner@suse.de - don't start as root because beagled doesn't run as root - ease application search path configuration -* Tue Feb 14 2006 - stbinner@suse.de +* Tue Feb 14 2006 stbinner@suse.de - don't show individual subparts of multipart/alternative messages (like changed in beagle-search upstream, GNOME #328497) - updated translations -* Mon Feb 13 2006 - stbinner@suse.de +* Mon Feb 13 2006 stbinner@suse.de - fix opening of IRC log files -* Fri Feb 10 2006 - stbinner@suse.de +* Fri Feb 10 2006 stbinner@suse.de - run beagle-shutdown on requested quit (#147578) -* Mon Feb 06 2006 - stbinner@suse.de +* Mon Feb 06 2006 stbinner@suse.de - install translations -* Fri Feb 03 2006 - stbinner@suse.de +* Fri Feb 03 2006 stbinner@suse.de - update to version 0.06 with latest svn.suse.de changes: * kdeinit patch to improve memory usage/startup time from Lubos * fix Firefox history title display and Evolution mail opening * dumb fallback if beagle-imlogviewer is not installed * better layout of hit cells -* Sun Jan 22 2006 - stbinner@suse.de +* Sun Jan 22 2006 stbinner@suse.de - update to version 0.05 (make build with newest libbeagle API) -* Wed Jan 11 2006 - stbinner@suse.de +* Wed Jan 11 2006 stbinner@suse.de - update to version 0.04 -* Mon Jan 09 2006 - stbinner@suse.de +* Mon Jan 09 2006 stbinner@suse.de - update to version 0.03 -* Mon Jan 02 2006 - stbinner@suse.de +* Mon Jan 02 2006 stbinner@suse.de - update from SVN to fix compilation with new Beagle version -* Fri Dec 16 2005 - stbinner@suse.de +* Fri Dec 16 2005 stbinner@suse.de - initial package ++++++ beagle-0.3.diff ++++++ --- kerry/configure.in.in 2008/01/28 10:38:26 1.1 +++ kerry/configure.in.in 2008/01/28 10:38:47 @@ -52,14 +52,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.5" -AC_MSG_CHECKING(for libbeagle-0.2.5 (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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org