Hello community,
here is the log from the commit of package kdebase4-openSUSE for
openSUSE:Factory
checked in at Wed Oct 12 23:59:13 CEST 2011.
--------
--- openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes
2011-10-06 17:22:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-openSUSE/kdebase4-openSUSE.changes
2011-10-12 21:43:29.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Oct 12 19:34:24 UTC 2011 - co...@suse.com
+
+- copy over plasma setups for kdebase4-workspace-branding-openSUSE
+ (later to be patched)
+
+-------------------------------------------------------------------
+Wed Oct 12 14:32:10 UTC 2011 - co...@suse.com
+
+- update from git to merge branding and config-files
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.gq84KW/_old 2011-10-12 23:59:06.000000000 +0200
+++ /var/tmp/diff_new_pack.gq84KW/_new 2011-10-12 23:59:06.000000000 +0200
@@ -46,6 +46,7 @@
BuildRequires: oxygen-icon-theme
BuildRequires: rpm-devel
BuildRequires: wallpaper-branding-openSUSE
+BuildRequires: kdebase4-workspace-branding-upstream
PreReq: %fillup_prereq
Requires: kdebase4-workspace
Requires: plasmoid-folderview
@@ -84,7 +85,7 @@
Requires: plasma-theme-aya = %{_kde_platform_version}
Requires: susegreeter-branding-openSUSE = %{version}
Supplements: packageand(kdebase4-workspace:branding-openSUSE)
-Provides: kdebase4-workspace-branding = %{version}
+Provides: kdebase4-workspace-branding = %( echo `rpm -q --provides
kdebase4-workspace-branding-upstream | grep 'kdebase4-workspace-branding =' |
cut -d= -f2` )
Conflicts: otherproviders(kdebase4-workspace-branding)
%kde4_runtime_requires
@@ -134,8 +135,12 @@
for l in SUSEgreeter krpmview kde4-openSUSE kio_sysinfo; do
%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}
- cp -a branding/root/* %{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}
@@ -175,12 +180,12 @@
%files -n kdebase4-runtime-branding-openSUSE
%defattr(-,root,root)
-%doc branding/COPYING
+%doc COPYING
%{_kde4_appsdir}/desktoptheme/openSUSEdefault
%files -n kdebase4-workspace-branding-openSUSE
%defattr(-,root,root)
-%doc branding/COPYING
+%doc COPYING
%{_datadir}/autostart/
%{_datadir}/opensuse-kiwi
%{_kde4_applicationsdir}/SUSEgreeter.desktop
@@ -215,6 +220,9 @@
%{_kde4_sharedir}/env/
%{_localstatedir}/adm/fillup-templates/sysconfig.windowmanager-kde4
%config %{_sysconfdir}/kde4
+%_kde4_appsdir/plasma-desktop
+%_kde4_appsdir/plasma-netbook
+%_kde4_appsdir/plasma
%files -n kio_sysinfo
%defattr(-,root,root)
@@ -227,7 +235,7 @@
%files -n kio_sysinfo-branding-openSUSE
%defattr(-,root,root)
-%doc branding/COPYING
+%doc COPYING
%{_kde4_appsdir}/sysinfo/
%changelog
++++++ kdebase4-openSUSE-12.1.tar.bz2 ++++++
++++ 2339 lines of diff (skipped)
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
