Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory
checked in at Wed Oct 12 23:59:30 CEST 2011.
--------
--- openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2011-10-06 16:18:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes
2011-10-12 17:26:35.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 12 15:25:49 UTC 2011 - co...@suse.com
+
+- take out the corona patch, it should be in branding-openSUSE
+- put plasma files in branding-upstream and require specific version
+ of it from branding packages
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
plasma-branding-defaults-corona.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.y2AS5U/_old 2011-10-12 23:59:22.000000000 +0200
+++ /var/tmp/diff_new_pack.y2AS5U/_new 2011-10-12 23:59:22.000000000 +0200
@@ -93,7 +93,6 @@
#Patch-upstream: no
#Bug: bnc#462478
Patch99: kdm-long-xserver-timeout.diff
-Patch103: plasma-branding-defaults-corona.diff
Patch104: plasma-branding-defaults-applets.diff
Patch106: plasma-dashboard-leave.diff
Patch107: plasma-kickoff-newly-collapsing.diff
@@ -113,7 +112,7 @@
Requires: %name-branding = 11.4
%endif
%if %suse_version > 1140
-Requires: %name-branding = 12.1
+Requires: %name-branding = %{version}
%endif
Recommends: kdebase4-SuSE kwin plasma-addons plasmoid-quickaccess
python-kdebase4
Requires: kdebase4-workspace-ksysguardd = %version
@@ -166,7 +165,6 @@
#%patch94
%patch98
%patch99
-%patch103
%patch104
%patch106
%patch107 -p1
@@ -252,7 +250,7 @@
Provides: %{name}-branding = 11.4
%endif
%if %suse_version > 1140
-Provides: %{name}-branding = 12.1
+Provides: %{name}-branding = %{version}
%endif
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(kdebase4-workspace:branding-upstream)
@@ -272,7 +270,8 @@
Provides: kdm-branding = 11.4
%endif
%if %suse_version > 1140
-Provides: kdm-branding = 12.1
+# after 11.4 we rely on the major version
+Provides: kdm-branding = 4.7
%endif
Conflicts: otherproviders(kdm-branding)
Supplements: packageand(kdm:branding-upstream)
@@ -446,6 +445,11 @@
%_kde4_appsdir/ksplash/Themes/Default
%dir %_kde4_wallpapersdir
#_kde4_wallpapersdir/Horos
+%if %suse_version > 1140
+%_kde4_appsdir/plasma-desktop/init
+%_kde4_appsdir/plasma-netbook/init
+%_kde4_appsdir/plasma/layout-templates
+%endif
%files -n kdm-branding-upstream
%defattr(-,root,root)
@@ -568,6 +572,11 @@
%_datadir/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy
%dir %_kde4_libdir/strigi
%_kde4_libdir/strigi/strigita_font.so
+%if %suse_version > 1140
+%exclude %_kde4_appsdir/plasma-desktop/init
+%exclude %_kde4_appsdir/plasma-netbook/init
+%exclude %_kde4_appsdir/plasma/layout-templates
+%endif
#blacklist
%exclude %_kde4_appsdir/kwin/titlebar_decor.png
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
