Hello community, here is the log from the commit of package kdevplatform for openSUSE:Factory checked in at Fri Jan 29 17:48:47 CET 2010. -------- --- KDE/kdevplatform/kdevplatform.changes 2009-12-16 09:59:09.000000000 +0100 +++ kdevplatform/kdevplatform.changes 2010-01-29 13:39:54.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 29 12:39:31 UTC 2010 - llunak@novell.com + +- fix file conflict + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevplatform.spec ++++++ --- /var/tmp/diff_new_pack.NUDMEQ/_old 2010-01-29 17:47:44.000000000 +0100 +++ /var/tmp/diff_new_pack.NUDMEQ/_new 2010-01-29 17:47:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdevplatform (Version 0.9.97) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Summary: Base Package for Integrated Development Environments Url: http://www.kdevelop.org Version: 0.9.97 -Release: 1 +Release: 2 Source0: kdevplatform-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -63,6 +63,8 @@ cd build %makeinstall %kde_post_install + # file conflict with kdelibs4 + rm $RPM_BUILD_ROOT/%_kde_share_dir/apps/cmake/modules/FindKDevPlatform.cmake %post -p /sbin/ldconfig @@ -179,7 +181,7 @@ %_kde4_modules/kdevsubversion.so %_kde4_modules/kdevdocumentswitcher.so #%_kde4_modules/kdevmercurial.so -%_kde_share_dir/apps/cmake/modules/FindKDevPlatform.cmake +#%_kde_share_dir/apps/cmake/modules/FindKDevPlatform.cmake %_kde_share_dir/apps/kdevcontextbrowser %_kde_share_dir/apps/kdevcvs %_kde_share_dir/apps/kdevfilemanager ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org