Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Thu Aug 4 14:45:40 CEST 2011.
-------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2011-07-23 09:49:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2011-08-04 11:32:40.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Aug 4 09:28:30 UTC 2011 - [email protected] + +- Add nepomuk-disable-monthly-backup.patch, nepomuk doesn't implement + monthly backups, remove it from the GUI. Upstream commit hash + f21e1ec8b2a81000811916c9c338a80ffbd18629 +- Cleanup spec file + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nepomuk-disable-monthly-backup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.mZ9Crs/_old 2011-08-04 14:42:37.000000000 +0200 +++ /var/tmp/diff_new_pack.mZ9Crs/_new 2011-08-04 14:42:37.000000000 +0200 @@ -18,23 +18,13 @@ Name: kdebase4-runtime +Version: 4.7.0 +Release: 3 License: GPLv2+ -Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.7.0 -Release: 1 -BuildRequires: libkde4-devel >= %version -BuildRequires: NetworkManager-devel bluez-devel libqimageblitz-devel openslp-devel -BuildRequires: OpenEXR-devel libsmbclient-devel libsoprano-devel libxklavier-devel xine-devel -BuildRequires: fdupes libattica-devel libksuseinstall-devel libusb-devel shared-desktop-ontologies-devel -BuildRequires: libexiv2-devel -BuildRequires: soprano-backend-redland soprano-backend-virtuoso -BuildRequires: libcanberra-devel libpulse-devel -BuildRequires: libssh-devel -BuildRequires: xz-devel -BuildRequires: lzma-devel -Source0: kde-runtime-%version.tar.bz2 +Group: System/GUI/KDE +Source0: kde-runtime-%{version}.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu Source3: kde-settings.directory @@ -51,29 +41,56 @@ Patch15: kdesu-symbol-lookup-workaround.diff Patch16: phonon-always-forget.diff Patch17: desktop-files.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: oxygen-icon-theme >= 4.6.40 +Patch18: nepomuk-disable-monthly-backup.patch +BuildRequires: NetworkManager-devel +BuildRequires: OpenEXR-devel +BuildRequires: bluez-devel +BuildRequires: fdupes +BuildRequires: libattica-devel +BuildRequires: libcanberra-devel +BuildRequires: libexiv2-devel +BuildRequires: libkde4-devel >= %{version} +BuildRequires: libksuseinstall-devel +BuildRequires: libpulse-devel +BuildRequires: libqimageblitz-devel +BuildRequires: libsmbclient-devel +BuildRequires: libsoprano-devel +BuildRequires: libssh-devel +BuildRequires: libusb-devel +BuildRequires: lzma-devel +BuildRequires: openslp-devel +BuildRequires: shared-desktop-ontologies-devel +BuildRequires: soprano-backend-redland +BuildRequires: soprano-backend-virtuoso +BuildRequires: xine-devel +BuildRequires: xz-devel +BuildRequires: pkgconfig(libxklavier) +Requires: dbus-1-x11 +Requires: kdelibs4 >= %{version} Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) -Requires: kdelibs4 >= %version -Requires: phonon dbus-1-x11 soprano-backend-redland -Requires(post): shared-mime-info -Requires(postun): shared-mime-info -Suggests: cagibi -Recommends: kdialog -Provides: suse_help_viewer -Recommends: ispell, enscript +Requires: oxygen-icon-theme >= 4.6.40 +Requires: phonon +Requires: soprano-backend-redland +Recommends: enscript #htdig is needed by khelpcenter for indexing help files Recommends: htdig -%define debug_package_requires %name = %version-%release kdelibs4-debuginfo +Recommends: ispell, +Recommends: kdialog +Suggests: cagibi +Provides: suse_help_viewer +%define debug_package_requires %{name} = %{version}-%{release} kdelibs4-debuginfo Obsoletes: kdebase3 <= 3.5.1 -%if %suse_version == 1130 -Requires: %name-branding = 11.3 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +%if 0%{?suse_version} == 1130 +Requires: %{name}-branding = 11.3 %endif -%if %suse_version == 1140 -Requires: %name-branding = 11.4 +%if 0%{?suse_version} == 1140 +Requires: %{name}-branding = 11.4 %endif -%if %suse_version > 1140 -Requires: %name-branding = 12.1 +%if 0%{?suse_version} > 1140 +Requires: %{name}-branding = 12.1 %endif Provides: plasma-theme-air = 4.2.90 Obsoletes: plasma-theme-air <= 4.2.90 @@ -87,43 +104,37 @@ This package contains all run-time dependencies of KDE applications. %package branding-upstream -Summary: The KDE Runtime Components License: GPLv2+ +Summary: The KDE Runtime Components Group: System/GUI/KDE #BRAND: FIXME -%if %suse_version == 1130 +%if 0%{?suse_version} == 1130 Provides: %{name}-branding = 11.3 %endif -%if %suse_version == 1140 +%if 0%{?suse_version} == 1140 Provides: %{name}-branding = 11.4 %endif -%if %suse_version > 1140 +%if 0%{?suse_version} > 1140 Provides: %{name}-branding = 12.1 %endif -Conflicts: otherproviders(%{name}-branding) Supplements: packageand(kdebase4-runtime:branding-upstream) +Conflicts: otherproviders(%{name}-branding) %description branding-upstream This package contains all run-time dependencies of KDE applications. %package -n plasma-theme-oxygen -Summary: The Oxygen Plasma Theme License: GPLv2+ +Summary: The Oxygen Plasma Theme Group: System/GUI/KDE Provides: kdebase4-runtime:/usr/share/kde4/apps/desktoptheme/oxygen/metadata.desktop %description -n plasma-theme-oxygen This package contains the Plasma theme Oxygen. - - -Authors: --------- - The KDE Team <[email protected]> - %package xine -Summary: The KDE Runtime Components License: GPLv2+ +Summary: The KDE Runtime Components Group: System/GUI/KDE Supplements: packageand(kdebase4-runtime:phonon-backend-xine) @@ -131,15 +142,9 @@ This package contains run-time dependencies of KDE applications when using the Xine Phonon backend. - - -Authors: --------- - The KDE Team <[email protected]> - %prep -%setup -q -n kde-runtime-%version -cp %{SOURCE4} $RPM_BUILD_DIR/kde-runtime-%version/knotify/sounds/ +%setup -q -n kde-runtime-%{version} +cp %{SOURCE4} $RPM_BUILD_DIR/kde-runtime-%{version}/knotify/sounds/ # causes crashes, disabled for now #%patch2 %patch3 @@ -152,6 +157,7 @@ %patch15 %patch16 %patch17 +%patch18 -p1 %build %cmake_kde4 -d build @@ -159,24 +165,24 @@ %install cd build - %makeinstall - rm -rf $RPM_BUILD_ROOT/usr/share/icons/hicolor/index.theme - rm -rf $RPM_BUILD_ROOT/usr/share/icons/oxygen - rm -rf $RPM_BUILD_ROOT/usr/share/wallpapers - mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus - mv $RPM_BUILD_ROOT/etc/xdg/menus/kde-information.menu $RPM_BUILD_ROOT/etc/xdg/menus/kde4-information.menu - mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged - install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged/kde4-essential.menu - install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/xdg/menus/kde4-settings.menu - install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/desktop-directories/ - mkdir -p $RPM_BUILD_ROOT/usr/bin - ln -s %_libdir/kde4/libexec/kdesu $RPM_BUILD_ROOT/usr/bin/kdesu - rm -rf $RPM_BUILD_ROOT/usr/include/KDE - %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps +%make_install + rm -rf %{buildroot}%{_datadir}/icons/hicolor/index.theme + rm -rf %{buildroot}%{_datadir}/icons/oxygen + rm -rf %{buildroot}%{_datadir}/wallpapers + mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus + mv %{buildroot}%{_sysconfdir}/xdg/menus/kde-information.menu %{buildroot}%{_sysconfdir}/xdg/menus/kde4-information.menu + mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged + install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde4-essential.menu + install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/menus/kde4-settings.menu + install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/desktop-directories/ + mkdir -p %{buildroot}%{_prefix}/bin + ln -s %{_libdir}/kde4/libexec/kdesu %{buildroot}%{_bindir}/kdesu + rm -rf %{buildroot}%{_includedir}/KDE + mkdir -p %{buildroot}%{_datadir}/pixmaps install $RPM_SOURCE_DIR/nepomuk.png %{buildroot}%{_datadir}/pixmaps/ %suse_update_desktop_file -r knetattach System Network %suse_update_desktop_file Help Documentation Viewer - %fdupes -s $RPM_BUILD_ROOT + %fdupes -s %{buildroot} %kde_post_install %post @@ -192,7 +198,7 @@ %verify_permissions -e /usr/bin/kdesud %clean - rm -rf $RPM_BUILD_ROOT + rm -rf %{buildroot} %files branding-upstream %defattr(-,root,root) @@ -493,33 +499,33 @@ %_kde4_applicationsdir/Help.desktop %_kde4_applicationsdir/nepomukcontroller.desktop %_kde4_applicationsdir/knetattach.desktop -/usr/share/autostart/nepomukcontroller.desktop -/usr/share/autostart/nepomukserver.desktop -/usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml -/usr/share/dbus-1/interfaces/org.kde.KTimeZoned.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.Query.xml -/usr/share/dbus-1/interfaces/org.kde.NepomukServer.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.Strigi.xml -/usr/share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml -/usr/share/dbus-1/services/org.kde.knotify.service -/usr/share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml -/usr/share/dbus-1/services/org.kde.kuiserver.service -/usr/share/desktop-directories +%{_datadir}/autostart/nepomukcontroller.desktop +%{_datadir}/autostart/nepomukserver.desktop +%{_datadir}/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml +%{_datadir}/dbus-1/interfaces/org.kde.KTimeZoned.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.Query.xml +%{_datadir}/dbus-1/interfaces/org.kde.NepomukServer.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.Storage.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.Strigi.xml +%{_datadir}/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml +%{_datadir}/dbus-1/services/org.kde.knotify.service +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml +%{_datadir}/dbus-1/services/org.kde.kuiserver.service +%{_datadir}/desktop-directories %_kde4_iconsdir/hicolor/*/apps/knetattach.* -/usr/share/locale/* -/usr/share/sounds/*.ogg +%{_datadir}/locale/* +%{_datadir}/sounds/*.ogg %_kde4_servicesdir/desktopthumbnail.desktop %_kde4_mandir/man8/nepomukserver.8.gz %_kde4_mandir/man8/nepomukservicestub.8.gz -/usr/share/mime/packages/network.xml -%verify(not mode) %attr(2755,root,nogroup) /usr/%_lib/kde4/libexec/kdesud +%{_datadir}/mime/packages/network.xml +%verify(not mode) %attr(2755,root,nogroup) %{_libdir}/kde4/libexec/kdesud %_kde4_bindir/plasmapkg %_kde4_modulesdir/plasma_appletscript_simple_javascript.so %_kde4_modulesdir/plasma_runnerscript_javascript.so @@ -541,13 +547,13 @@ %_kde4_servicesdir/kded/networkstatus.desktop %_kde4_servicesdir/nepomukactivitiesservice.desktop %config %_kde4_sysconfdir/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf -/usr/share/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service +%{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service %_kde4_libexecdir/kcmremotewidgetshelper -/usr/share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy -/usr/share/ontology/kde/ +%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy +%{_datadir}/ontology/kde/ %_kde4_servicesdir/plasma-kpart.desktop %_kde4_modulesdir/plasma-kpart.so -/usr/include/knotify_export* +%{_includedir}/knotify_export* %_kde4_modulesdir/imports/ %_kde4_modulesdir/plasma_appletscript_declarative.so %_kde4_servicesdir/plasma-scriptengine-applet-declarative.desktop @@ -555,20 +561,20 @@ %_kde4_bindir/kactivitymanagerd %_kde4_libdir/libknotifyplugin.so %_kde4_servicetypes/knotifynotifymethod.desktop -/usr/include/knotifyconfig.h -/usr/include/knotifyplugin.h -/usr/include/nepomuk +%{_includedir}/knotifyconfig.h +%{_includedir}/knotifyplugin.h +%{_includedir}/nepomuk %_kde4_modulesdir/nepomukbackupsync.so -/usr/share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml -/usr/share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml +%{_datadir}/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml %_kde4_servicesdir/nepomukbackupsync.desktop %_kde4_bindir/nepomukbackup -/usr/share/pixmaps/nepomuk.png +%{_datadir}/pixmaps/nepomuk.png %_kde4_applicationsdir/nepomukbackup.desktop %_kde4_libdir/libnepomuksync.so* -%_datadir/emoticons/ -%_datadir/icons/default.kde4 +%{_datadir}/emoticons/ +%{_datadir}/icons/default.kde4 %_kde4_bindir/ksvgtopng %changelog ++++++ nepomuk-disable-monthly-backup.patch ++++++ From: Burkhard Lück <[email protected]> Date: Thu, 04 Aug 2011 09:20:59 +0000 Subject: Remove monthly auto backups from the GUI X-Git-Url: http://quickgit.kde.org/?p=kde-runtime.git&a=commitdiff&h=f21e1ec8b2a81000811916c9c338a80ffbd18629 --- Remove monthly auto backups from the GUI Monthly auto backup was removed in 4.6 with http://websvn.kde.org/?view=revision&revision=1215783 with this log: Removed monthly auto backups in 4.6. It was missing the date configuration and does not seem to be implemented in the service anyway. Not implemented in 4.7 or master, so remove it from the gui REVIEW:102195 CCBUG:263530 (cherry picked from commit c02dc754657552bf35c2e2380701589d9d97e792) --- --- a/nepomuk/kcm/nepomukserverkcm.cpp +++ b/nepomuk/kcm/nepomukserverkcm.cpp @@ -105,7 +105,6 @@ namespace { DisableAutomaticBackups = 0, DailyBackup = 1, WeeklyBackup = 2, - MonthlyBackup = 3 }; @@ -115,8 +114,6 @@ namespace { return QLatin1String("daily"); case WeeklyBackup: return QLatin1String("weekly"); - case MonthlyBackup: - return QLatin1String("monthly"); default: return QLatin1String("disabled"); } @@ -197,7 +194,6 @@ Nepomuk::ServerConfigModule::ServerConfi m_comboBackupFrequency->addItem(i18nc("@item:inlistbox", "Disable Automatic Backups")); m_comboBackupFrequency->addItem(i18nc("@item:inlistbox", "Daily Backup")); m_comboBackupFrequency->addItem(i18nc("@item:inlistbox", "Weekly Backup")); - m_comboBackupFrequency->addItem(i18nc("@item:inlistbox", "Monthly Backup")); for( int i = 1; i <= 7; ++i ) m_comboBackupDay->addItem(KGlobal::locale()->calendar()->weekDayName(i), i); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
