Hello community, here is the log from the commit of package kerry checked in at Fri Sep 21 15:48:33 CEST 2007. -------- --- KDE/kerry/kerry.changes 2007-06-04 10:53:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2007-09-20 16:49:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 20 16:49:15 CEST 2007 - stbinner@suse.de + +- adapt Kerry to changed beagled autostart mechanism (#326741) + +------------------------------------------------------------------- New: ---- new-beagle-autostart.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kerry.spec ++++++ --- /var/tmp/diff_new_pack.J30322/_old 2007-09-21 15:48:24.000000000 +0200 +++ /var/tmp/diff_new_pack.J30322/_new 2007-09-21 15:48:24.000000000 +0200 @@ -12,12 +12,12 @@ Name: kerry BuildRequires: kdebase3-devel libbeagle-devel -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/GUI/KDE Summary: Desktop search tool BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 0.2.2 -Release: 43 +Release: 87 Source: %{name}-%{version}.tar.bz2 Requires: beagle >= 0.2.6 Requires: libbeagle >= 0.2.6 @@ -26,6 +26,7 @@ %endif Patch: svn.diff Patch2: fix-desktop-file.diff +Patch3: new-beagle-autostart.diff %description A desktop search tool integrated with Beagle and KDE. @@ -43,6 +44,9 @@ %patch %patch2 -p1 cd .. +%if %suse_version > 1020 +%patch3 +%endif . /etc/opt/kde3/common_options update_admin @@ -56,7 +60,9 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %suse_update_desktop_file kerry %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/autostart/kerry.autostart.desktop +%if %suse_version < 1030 %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/autostart/beagled.desktop +%endif %suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/kcmbeagle.desktop %if %suse_version > 1000 %find_lang %name --all-name @@ -87,12 +93,15 @@ /opt/kde3/share/applnk/.hidden/kcmkerry.desktop %dir /opt/kde3/share/apps/kerry /opt/kde3/share/apps/kerry/search-running.mng +%if %suse_version < 1030 /opt/kde3/share/autostart/beagled.desktop +%endif /opt/kde3/share/autostart/kerry.autostart.desktop %dir /opt/kde3/shutdown /opt/kde3/shutdown/beagled-shutdown.sh - %changelog +* Thu Sep 20 2007 - stbinner@suse.de +- adapt Kerry to changed beagled autostart mechanism (#326741) * Mon Jun 04 2007 - stbinner@suse.de - fix build on older distributions * Sun May 20 2007 - stbinner@suse.de ++++++ new-beagle-autostart.diff ++++++ --- kerry/src/Makefile.am 2007/09/20 14:20:40 1.1 +++ kerry/src/Makefile.am 2007/09/20 14:21:05 @@ -31,7 +31,7 @@ kerry_la_LIBADD = -lkio -lkonq $(LIB_KDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) autostartdir = $(datadir)/autostart -autostart_DATA = kerry.autostart.desktop beagled.desktop +autostart_DATA = kerry.autostart.desktop shutdowndir = $(prefix)/shutdown shutdown_SCRIPTS = beagled-shutdown.sh --- kerry/src/kcm/indexing.cpp 2007/09/20 12:33:38 1.3 +++ kerry/src/kcm/indexing.cpp 2007/09/20 14:47:46 @@ -163,9 +163,9 @@ _startBeagle = true; } else { - KConfig *config = new KConfig("kerryrc"); - config->setGroup("Beagle"); - _startBeagle = config->readBoolEntry("AutoStart",false); + KConfig *config = new KConfig(QDir::home().absPath()+"/.config/autostart/beagled-autostart.desktop"); + config->setDesktopGroup(); + _startBeagle = config->readBoolEntry("X-GNOME-Autostart-enabled",true); delete config; readIndexConfig(_indexHomeDir, _indexOnBattery, roots, excludeTypes, excludeValues); @@ -199,12 +199,27 @@ void KCMBeagleIndexing::save() { - KConfig *config = new KConfig("kerryrc"); - config->setGroup("Beagle"); - config->writeEntry("AutoStart",startBeagle->isChecked()); - config->sync(); - delete config; - + if (!startBeagle->isChecked()) { + QDir configDir(QDir::home().absPath()+"/.config"); + if (!configDir.exists()) + configDir.mkdir(QDir::home().absPath()+"/.config"); + + QDir configAutostartDir(QDir::home().absPath()+"/.config/autostart"); + if (!configAutostartDir.exists()) + configAutostartDir.mkdir(QDir::home().absPath()+"/.config/autostart"); + + KConfig *config = new KConfig(QDir::home().absPath()+"/.config/autostart/beagled-autostart.desktop"); + config->setDesktopGroup(); + config->writeEntry("Hidden",true); + config->writeEntry("X-GNOME-Autostart-enabled",false); + config->sync(); + delete config; + } + else { + QFile file( QDir::home().absPath()+"/.config/autostart/beagled-autostart.desktop" ); + if (file.exists()) + file.remove(); + } QStringList roots; for (int i=0;i<index_list->childCount();i++) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org