commit kdebase4-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2016-01-23 01:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2016-01-07 00:24:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2016-01-23 01:13:54.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 15:12:28 UTC 2016 - tittiatcoke@gmail.com + +- Update to 13.3 + * Remove all branding related files and packages. + * Drop patch plasma-change-defaults.diff + * Drop the BuildRequires on kdebase4-workspace. This is no + longer required. + +------------------------------------------------------------------- Old: ---- kdebase4-openSUSE-13.2.tar.bz2 plasma-change-defaults.diff New: ---- kdebase4-openSUSE-13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.UDb33X/_old 2016-01-23 01:13:55.000000000 +0100 +++ /var/tmp/diff_new_pack.UDb33X/_new 2016-01-23 01:13:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4-openSUSE -Version: 13.2 +Version: 13.3 Release: 0 Summary: openSUSE KDE Extension License: GPL-2.0+ @@ -25,23 +25,21 @@ # git clone git://github.com/openSUSE/kdebase-opensuse.git Url: http://www.opensuse.org/ Source0: kdebase4-openSUSE-%{version}.tar.bz2 -Source2: plasma-change-defaults.diff BuildRequires: fdupes BuildRequires: hwinfo-devel -BuildRequires: kdebase4-runtime-branding-upstream -BuildRequires: kdebase4-workspace-branding-upstream -BuildRequires: kdebase4-workspace-devel >= 4.11.8 BuildRequires: libkde4-devel BuildRequires: oxygen-icon-theme BuildRequires: rpm-devel BuildRequires: wallpaper-branding-openSUSE - PreReq: %fillup_prereq -Requires: kdebase4-workspace -Requires: plasmoid-folderview Recommends: %{name}-lang Provides: kdebase4-SuSE = %{version} Obsoletes: kdebase4-SuSE < %{version} +Obsoletes: kdebase4-runtime-branding-openSUSE < %{version} +Provides: kdebase4-runtime-branding-openSUSE = %{version} +Obsoletes: kdebase4-workspace-branding-openSUSE < %{version} +Provides: kdebase4-workspace-branding-openSUSE = %{version} +Provides: kdebase4-runtime-branding = %{_kde_branding_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %kde4_runtime_requires @@ -49,36 +47,6 @@ %description This package contains the standard openSUSE desktop and extensions. -%package -n kdebase4-workspace-branding-openSUSE -Summary: openSUSE KDE Extension -Group: System/GUI/KDE -PreReq: %fillup_prereq -Requires: kdebase4-workspace -# Explicitly require kdebase4-runtime-branding-oS, until kde#320855 is properly resolved -Requires: kdebase4-runtime-branding-openSUSE = %{version} -Requires: ksplashx-branding-openSUSE = %{version} -Requires: susegreeter-branding-openSUSE = %{version} -Requires: wallpaper-branding-openSUSE >= %{version} -Supplements: packageand(kdebase4-workspace:branding-openSUSE) -Provides: kdebase4-workspace-branding = %{_kde_branding_version} -Conflicts: otherproviders(kdebase4-workspace-branding) -%kde4_runtime_requires - -%description -n kdebase4-workspace-branding-openSUSE -This package contains the standard openSUSE desktop and extensions. - -%package -n kdebase4-runtime-branding-openSUSE -Summary: The KDE Runtime Components -Group: System/GUI/KDE -PreReq: %fillup_prereq -Supplements: packageand(kdebase4-runtime:branding-openSUSE) -Provides: kdebase4-runtime-branding = %{_kde_branding_version} -Conflicts: otherproviders(kdebase4-runtime-branding) -%kde4_runtime_requires - -%description -n kdebase4-runtime-branding-openSUSE -This package contains all run-time dependencies of KDE applications. - %lang_package %prep %setup -q -n %{name} @@ -100,23 +68,12 @@ %find_lang $l suse.lang done mv config-files/COPYING . - for dir in %_kde4_appsdir/plasma-desktop/init %_kde4_appsdir/plasma-netbook/init %_kde4_appsdir/plasma/layout-templates; do - mkdir -p %{buildroot}$dir - cp -a $dir/* %{buildroot}$dir/ - done cp -a config-files/* %{buildroot} - gzip %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg - mv %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svg.gz %{buildroot}%{_kde4_appsdir}/desktoptheme/openSUSEdefault/widgets/branding.svgz chmod og-w -R %{buildroot} chmod a+x %{buildroot}/usr/share/kde4/apps/kconf_update/*.sh %suse_update_desktop_file -u SUSEgreeter System Documentation %fdupes -s %{buildroot}%{_kde4_configdir}/SuSE/default/ %kde_post_install - pushd %{buildroot}/%{_kde4_appsdir} - cp %{_kde4_appsdir}/plasma-desktop/init/00-defaultLayout.js %{buildroot}/%{_kde4_appsdir}/plasma-desktop/init/ - cp %{_kde4_appsdir}/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js %{buildroot}/%{_kde4_appsdir}/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/ - patch -p0 < %{SOURCE2} - popd #Make the "rpm:"-search default to to the correct version of openSUSE (see bnc#695417) sed -i s/12.1/%{version}/ %{buildroot}%{_kde4_servicesdir}/searchproviders/rpm.desktop @@ -124,18 +81,15 @@ #remove sysinfo from the standard desktop rm %{buildroot}%{_kde4_configdir}/SuSE/default/myComputer.desktop -%post -n kdebase4-workspace-branding-openSUSE -%{fillup_only -n windowmanager -s kde4} - %files lang -f suse.lang %defattr(-,root,root) %files %defattr(-,root,root) +%doc COPYING %{_kde4_applicationsdir}/konqfilemgr_rpm.desktop %{_kde4_appsdir}/krpmview %{_kde4_bindir}/kde_add_yast_source.sh -%{_kde4_bindir}/kde4-migrate %{_kde4_bindir}/preloadkde %dir %{_kde4_configdir} %dir %{_kde4_configdir}/SuSE @@ -147,27 +101,10 @@ %{_kde4_modulesdir}/libkrpmview.so %{_kde4_servicesdir}/krpmview.desktop %{_kde4_servicesdir}/searchproviders - -%files -n kdebase4-runtime-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -%dir %{_kde4_appsdir}/desktoptheme -%{_kde4_appsdir}/desktoptheme/openSUSEdefault -%{_kde4_appsdir}/desktoptheme/openSUSE -%{_kde4_appsdir}/desktoptheme/openSUSElight/ -%{_kde4_appsdir}/color-schemes %config %{_sysconfdir}/kde4 - -%files -n kdebase4-workspace-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -%{_datadir}/autostart/ -%{_datadir}/opensuse-kiwi %{_kde4_applicationsdir}/SUSEgreeter.desktop %{_kde4_appsdir}/kconf_update/ %{_kde4_appsdir}/konsole/ -%{_kde4_appsdir}/kwin/ -%{_kde4_appsdir}/plasma-desktop %{_kde4_appsdir}/SUSEgreeter %{_kde4_bindir}/SUSEgreeter %dir %{_kde4_configdir} @@ -194,8 +131,8 @@ %{_kde4_iconsdir}/oxygen/ %{_kde4_sharedir}/env/ %{_localstatedir}/adm/fillup-templates/sysconfig.windowmanager-kde4 -%_kde4_appsdir/plasma-desktop -%_kde4_appsdir/plasma-netbook -%_kde4_appsdir/plasma +%{_datadir}/autostart/SUSEgreeter.desktop +%{_kde4_appsdir}/color-schemes/ +%{_datadir}/opensuse-kiwi/ %changelog ++++++ kdebase4-openSUSE-13.2.tar.bz2 -> kdebase4-openSUSE-13.3.tar.bz2 ++++++ ++++ 89573 lines of diff (skipped)
participants (1)
-
root@hilbert.suse.de