commit choqok for openSUSE:Factory
Hello community, here is the log from the commit of package choqok for openSUSE:Factory checked in at 2013-04-18 14:57:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/choqok (Old) and /work/SRC/openSUSE:Factory/.choqok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "choqok", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/choqok/choqok.changes 2012-03-07 13:41:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.choqok.new/choqok.changes 2013-04-18 14:57:36.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 17 20:58:39 UTC 2013 - coolo@suse.com + +- remove file conflicting with kdepimlibs4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ choqok.spec ++++++ --- /var/tmp/diff_new_pack.LEOVIE/_old 2013-04-18 14:57:38.000000000 +0200 +++ /var/tmp/diff_new_pack.LEOVIE/_new 2013-04-18 14:57:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package choqok # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -57,6 +57,8 @@ %install pushd build %kde4_makeinstall + # file conflict with kdepimlibs + rm %{buildroot}%{_kde4_appsdir}/cmake/modules/FindQtOAuth.cmake %fdupes popd %suse_update_desktop_file %{name} InstantMessaging -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de