Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Mon Apr 26 17:52:56 CEST 2010. -------- --- KDE/kdelibs4/kdelibs4.changes 2010-04-19 17:39:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2010-04-24 12:01:27.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Apr 24 09:59:56 UTC 2010 - cmorve69@yahoo.es + +- don't modify KDE_VERSION_STRING for development projects + +------------------------------------------------------------------- +Thu Apr 22 14:36:34 CEST 2010 - dmueller@suse.de + +- remove dependency cycle + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.FyIkat/_old 2010-04-26 17:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.FyIkat/_new 2010-04-26 17:52:42.000000000 +0200 @@ -49,7 +49,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.4.2 -Release: 4 +Release: 5 Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -149,7 +149,12 @@ # # define KDE version exactly # -sed -ri "s,#cmakedefine KDE_VERSION_STRING \"@KDE_VERSION_STRING@\",#cmakedefine KDE_VERSION_STRING \"@KDE_VERSION_STRING@ \\\\\"release $(echo %release | cut -d. -f-1)\\\\\"\"," kdecore/util/kdeversion.h.cmake +if [ '%{_project}' != KDE:KDE4:Factory:Desktop -a \ + '%{_project}' != KDE:KDE4:UNSTABLE:Desktop -a \ + '%{_project}' != KDE:KDE4:STABLE:Desktop -a \ + '%{_project}' != openSUSE:Factory ] ; then + sed -ri "s,#cmakedefine KDE_VERSION_STRING \"@KDE_VERSION_STRING@\",#cmakedefine KDE_VERSION_STRING \"@KDE_VERSION_STRING@ \\\\\"release $(echo %release | cut -d. -f-1)\\\\\"\"," kdecore/util/kdeversion.h.cmake +fi %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde_libdir} \ @@ -168,6 +173,7 @@ %makeinstall %create_subdir_filelist -d kdecore -v kdecore.devel %create_subdir_filelist -d kpty -f kdecore -v kdecore.devel + echo "/usr/include/kdemacros.h" >> kdecore.devel cd .. %create_exclude_filelist mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged @@ -469,7 +475,6 @@ Summary: On-demand installation of packages Requires: yast2-packager zypper Recommends: ptools -%kde4_runtime_requires %description -n libksuseinstall1 This library implements private API to install additional packages for KDE. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org