Hello community, here is the log from the commit of package kio_sysinfo-branding-upstream for openSUSE:Factory checked in at Wed Jun 9 17:12:26 CEST 2010. -------- --- KDE/kio_sysinfo-branding-upstream/kio_sysinfo-branding-upstream.changes 2010-06-04 14:24:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/kio_sysinfo-branding-upstream/kio_sysinfo-branding-upstream.changes 2010-06-07 13:28:53.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Jun 6 23:30:00 UTC 2010 - johannesobermayr@gmx.de + +- remove BuildRequires: libkde4-devel +- checkout branches/opensuse/11.2/kio_sysinfo/src/about/generic +- fixes BNC#559318 + +------------------------------------------------------------------- +Sun Jun 6 07:40:08 UTC 2010 - coolo@novell.com + +- provide the number of branding-upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- usr.tar.bz2 New: ---- sysinfo.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio_sysinfo-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.DLraq7/_old 2010-06-09 17:11:57.000000000 +0200 +++ /var/tmp/diff_new_pack.DLraq7/_new 2010-06-09 17:11:57.000000000 +0200 @@ -19,26 +19,27 @@ Name: kio_sysinfo-branding-upstream -BuildRequires: libkde4-devel +BuildRequires: branding-upstream License: GPLv2+ Group: System/GUI/KDE Summary: System Information KIO-Slave Branding PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.3 -Release: 1 -Source0: usr.tar.bz2 +Release: 2 +Source0: sysinfo.tar.bz2 Source1: COPYING Requires: kio_sysinfo Supplements: packageand(kio_sysinfo:branding-upstream) -%if %suse_version == 1110 -Provides: kio_sysinfo-branding = 11.1 -%endif -%if %suse_version > 1110 +%if 0%{?suse_version} == 1120 +# 11.2 has it wrong Provides: kio_sysinfo-branding = 11.2 +%else +Provides: kio_sysinfo-branding = %(rpm -q --queryformat %{VERSION} branding-upstream) %endif Conflicts: otherproviders(kio_sysinfo-branding) BuildArch: noarch +# appeared last time in 11.1 Provides: kde4-kio_sysinfo-branding-upstream = 11.2 Obsoletes: kde4-kio_sysinfo-branding-upstream < 11.2 @@ -52,14 +53,15 @@ %install install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/doc/packages/kio_sysinfo-branding-upstream/COPYING - cd $RPM_BUILD_ROOT + mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps/sysinfo + cd $RPM_BUILD_ROOT/usr/share/kde4/apps/sysinfo tar xfj %SOURCE0 + rm -rf $RPM_BUILD_ROOT/usr/share/kde4/apps/sysinfo/about/CMakeLists.txt %files %defattr(-,root,root) -%defattr(-,root,root) %dir /usr/share/doc/packages/kio_sysinfo-branding-upstream %doc /usr/share/doc/packages/kio_sysinfo-branding-upstream/COPYING -/usr/share/kde4/apps/sysinfo +/usr/share/kde4/ %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org