Hello community, here is the log from the commit of package kio_beagle checked in at Mon Jan 28 16:05:36 CET 2008. -------- --- KDE/kio_beagle/kio_beagle.changes 2006-11-24 08:53:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/kio_beagle/kio_beagle.changes 2008-01-28 11:26:19.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 28 11:26:13 CET 2008 - stbinner@suse.de + +- fix build against libbeagle 0.3 + +------------------------------------------------------------------- Old: ---- kio-beagle-0.3.1.tar.gz New: ---- beagle-0.3.diff kio-beagle-0.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio_beagle.spec ++++++ --- /var/tmp/diff_new_pack.n15570/_old 2008-01-28 16:04:30.000000000 +0100 +++ /var/tmp/diff_new_pack.n15570/_new 2008-01-28 16:04:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kio_beagle (Version 0.3.1) # -# Copyright (c) 2006 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. # @@ -12,19 +12,25 @@ Name: kio_beagle BuildRequires: kdelibs3-devel libbeagle-devel -URL: http://www.kde-apps.org/content/show.php?content=28437 -License: GNU General Public License (GPL) +Url: http://www.kde-apps.org/content/show.php?content=28437 +License: GPL v2 or later Group: Productivity/Other Summary: KIO Slave for Beagle Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Version: 0.3.1 -Release: 32 +Release: 156 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: kio-beagle-%{version}.tar.gz +Source0: kio-beagle-%{version}.tar.bz2 Source1: icons.tar.bz2 +%if %suse_version >1030 +Requires: beagle >= 0.3.0 +Requires: libbeagle1 >= 0.3.0 +%else Requires: beagle >= 0.2.4 Requires: libbeagle >= 0.2.4 +%endif Patch: query-beagled-status.diff +Patch1: beagle-0.3.diff %description A KIO slave for Beagle that allows a user to use Beagle in Konqueror, @@ -40,6 +46,9 @@ %prep %setup -q -n kio-beagle-%{version} %patch +%if %suse_version >1030 +%patch1 +%endif . /etc/opt/kde3/common_options %build @@ -49,7 +58,6 @@ --enable-libsuffix=64 \ %endif --with-qt-libraries=/usr/lib/qt3/%_lib - make %install @@ -67,23 +75,25 @@ /opt/kde3/share/services/*.protocol /opt/kde3/share/icons/*/*/*/kio_beagle.* -%changelog -n kio_beagle -* Fri Nov 24 2006 - stbinner@suse.de +%changelog +* Mon Jan 28 2008 stbinner@suse.de +- fix build against libbeagle 0.3 +* Fri Nov 24 2006 stbinner@suse.de - add direct "Requires: Beagle" as libbeagle does not require it -* Thu Aug 24 2006 - stbinner@suse.de +* Thu Aug 24 2006 stbinner@suse.de - add protocol icon for usage from kdelibs3 & kdeaddons3-konqueror -* Tue Jul 11 2006 - stbinner@suse.de +* Tue Jul 11 2006 stbinner@suse.de - add beagled status query via beagle:?beagled-status -* Wed Jun 21 2006 - stbinner@suse.de +* Wed Jun 21 2006 stbinner@suse.de - Update to version 0.3.1 * Added some more i18n() strings to allow translations. * Dont hardcode beagle-include path. * Updated kio-slave to work with current beagle API. * Added proper handling of emails, applications, feeds, -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jan 23 2006 - stbinner@suse.de +* Mon Jan 23 2006 stbinner@suse.de - make compile with latest libbeagle API - add UDS_LOCAL_PATH atom to entries -* Thu Sep 01 2005 - stbinner@suse.de +* Thu Sep 01 2005 stbinner@suse.de - Initial package of version 0.2 ++++++ beagle-0.3.diff ++++++ --- configure.in.in 2008/01/28 10:05:20 1.1 +++ configure.in.in 2008/01/28 10:05:38 @@ -4,7 +4,7 @@ AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN -PKG_CHECK_MODULES(libbeagle, [libbeagle-0.0 >= 0.2.4]) +PKG_CHECK_MODULES(libbeagle, [libbeagle-1.0 >= 0.3.0]) AC_SUBST(libbeagle_CFLAGS) AC_SUBST(libbeagle_LIBS) --- configure.in 2008/01/28 10:11:47 1.1 +++ configure.in 2008/01/28 10:12:00 @@ -61,7 +61,7 @@ AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN -PKG_CHECK_MODULES(libbeagle, [libbeagle-0.0 >= 0.2.4]) +PKG_CHECK_MODULES(libbeagle, [libbeagle-1.0 >= 0.3.0]) AC_SUBST(libbeagle_CFLAGS) AC_SUBST(libbeagle_LIBS) --- configure 2008/01/28 10:12:25 1.1 +++ configure 2008/01/28 10:13:28 @@ -31295,12 +31295,12 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-0.0 >= 0.2.4\"") >&5 - ($PKG_CONFIG --exists --print-errors "libbeagle-0.0 >= 0.2.4") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= 0.3.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= 0.3.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_libbeagle_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-0.0 >= 0.2.4" 2>/dev/null` + pkg_cv_libbeagle_CFLAGS=`$PKG_CONFIG --cflags "libbeagle-1.0 >= 0.3.0" 2>/dev/null` else pkg_failed=yes fi @@ -31309,12 +31309,12 @@ fi if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-0.0 >= 0.2.4\"") >&5 - ($PKG_CONFIG --exists --print-errors "libbeagle-0.0 >= 0.2.4") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbeagle-1.0 >= 0.3.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "libbeagle-1.0 >= 0.3.0") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_libbeagle_LIBS=`$PKG_CONFIG --libs "libbeagle-0.0 >= 0.2.4" 2>/dev/null` + pkg_cv_libbeagle_LIBS=`$PKG_CONFIG --libs "libbeagle-1.0 >= 0.3.0" 2>/dev/null` else pkg_failed=yes fi @@ -31323,18 +31323,18 @@ fi if test $pkg_failed = yes; then - libbeagle_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-0.0 >= 0.2.4"` + libbeagle_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libbeagle-1.0 >= 0.3.0"` # Put the nasty error message in config.log where it belongs echo "$libbeagle_PKG_ERRORS" 1>&5 - { { echo "$as_me:$LINENO: error: Package requirements (libbeagle-0.0 >= 0.2.4) were not met. + { { echo "$as_me:$LINENO: error: Package requirements (libbeagle-1.0 >= 0.3.0) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively you may set the libbeagle_CFLAGS and libbeagle_LIBS environment variables to avoid the need to call pkg-config. See the pkg-config man page for more details." >&5 -echo "$as_me: error: Package requirements (libbeagle-0.0 >= 0.2.4) were not met. +echo "$as_me: error: Package requirements (libbeagle-1.0 >= 0.3.0) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org