May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit pv for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package pv for openSUSE:Factory checked in at 2014-05-06 17:42:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pv (Old) and /work/SRC/openSUSE:Factory/.pv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pv" Changes: -------- --- /work/SRC/openSUSE:Factory/pv/pv.changes 2013-08-23 11:08:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pv.new/pv.changes 2014-05-06 17:42:38.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 5 06:12:30 UTC 2014 - jengelh(a)inai.de + +- Update to new upstream release 1.5.3 +* Added new display options --buffer-percent, --last-written +* New transfer option --no-splice +* New option --watchfd to monitor file descriptor status of another + process, rather than moving data from stdin to stdout. + +------------------------------------------------------------------- Old: ---- pv-1.4.12.tar.bz2 pv-1.4.12.tar.bz2.txt New: ---- pv-1.5.3.tar.bz2 pv-1.5.3.tar.bz2.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pv.spec ++++++ --- /var/tmp/diff_new_pack.FpgUDz/_old 2014-05-06 17:42:39.000000000 +0200 +++ /var/tmp/diff_new_pack.FpgUDz/_new 2014-05-06 17:42:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pv # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,7 +17,7 @@ Name: pv -Version: 1.4.12 +Version: 1.5.3 Release: 0 Summary: PipeViewer - Monitor the Progress of Data through Pipes License: Artistic-2.0 @@ -32,9 +32,6 @@ BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: glibc-devel -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif BuildRequires: intltool BuildRequires: make %if 0%{?suse_version} && 0%{?suse_version} <= 1200 @@ -52,8 +49,6 @@ will be until completion. %prep -cp "%_sourcedir/%name-%version.tar.bz2.txt" "%_sourcedir/%name-%version.tar.bz2.asc" -%{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.bz2.asc} %setup -q %build ++++++ pv-1.4.12.tar.bz2 -> pv-1.5.3.tar.bz2 ++++++ ++++ 4622 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasma-addons for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at 2014-05-06 17:42:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-addons (Old) and /work/SRC/openSUSE:Factory/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-addons" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-addons/plasma-addons.changes 2014-04-18 12:37:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-addons.new/plasma-addons.changes 2014-05-06 17:42:33.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 4 00:26:13 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added libattica-devel BuildRequires, it was pulled in via + libkde4-devel previously + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.Ms293u/_old 2014-05-06 17:42:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Ms293u/_new 2014-05-06 17:42:34.000000000 +0200 @@ -31,6 +31,7 @@ BuildRequires: fdupes BuildRequires: ibus-devel BuildRequires: kdebase4-workspace-devel +BuildRequires: libattica-devel BuildRequires: libdbusmenu-qt-devel BuildRequires: libeigen2-devel BuildRequires: libkdepimlibs4-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit parley for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package parley for openSUSE:Factory checked in at 2014-05-06 17:42:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parley (Old) and /work/SRC/openSUSE:Factory/.parley.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parley" Changes: -------- --- /work/SRC/openSUSE:Factory/parley/parley.changes 2014-04-18 12:35:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.parley.new/parley.changes 2014-05-06 17:42:26.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 3 23:13:36 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added libattica-devel BuildRequires, was pulled in via libkde4-devel + previously + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parley.spec ++++++ --- /var/tmp/diff_new_pack.BCeNxN/_old 2014-05-06 17:42:27.000000000 +0200 +++ /var/tmp/diff_new_pack.BCeNxN/_new 2014-05-06 17:42:27.000000000 +0200 @@ -24,6 +24,7 @@ Group: Amusements/Teaching/Language Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +BuildRequires: libattica-devel BuildRequires: libkde4-devel BuildRequires: libkdeedu4-devel BuildRequires: libxml2-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxc for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2014-05-06 17:42:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lxc" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2014-03-04 13:14:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2014-05-06 17:42:18.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 5 13:08:04 UTC 2014 - opensuse_buildservice(a)ojkastl.de + +- added file /usr/sbin/rxlcx that links to /usr/sbin/service + +------------------------------------------------------------------- +Mon May 5 10:14:06 UTC 2014 - opensuse_buildservice(a)ojkastl.de + +- upgrade to version 1.0.3 +- deleted patch patch_bash_completion.d_lxc.patch, as it is included upstream already +- added file /usr/sbin/init.lxc + +------------------------------------------------------------------- Old: ---- lxc-1.0.0.tar.gz patch_bash_completion.d_lxc.patch New: ---- lxc-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.txDvsq/_old 2014-05-06 17:42:19.000000000 +0200 +++ /var/tmp/diff_new_pack.txDvsq/_new 2014-05-06 17:42:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: lxc -Version: 1.0.0 +Version: 1.0.3 Release: 0 Url: http://linuxcontainers.org/ Summary: Userspace tools for the Linux kernel containers @@ -27,9 +27,6 @@ Source1: README.SUSE Source2: lxc-createconfig.in -# PATCH-FIX-UPSTREAM patch_bash_completion.d_lxc.patch opensuse_buildservice(a)ojkastl.de -- removes shebang from bash_completion-file -Patch0: patch_bash_completion.d_lxc.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: docbook-utils @@ -45,9 +42,14 @@ BuildRequires: lua-devel BuildRequires: pkg-config BuildRequires: python3-devel + +%if 0%{?suse_version} >= 1210 BuildRequires: systemd +%endif + Requires: /sbin/setcap Requires: rsync + %{?systemd_requires} # needed to create openSUSE containers using template Recommends: build @@ -73,7 +75,6 @@ %prep %setup -q -%patch0 -p1 %build chmod 755 configure @@ -89,9 +90,9 @@ install -d -m 755 %{buildroot}/var/lib/lxc find %buildroot -type f -name '*.la' -delete chmod u-s %{buildroot}/usr/lib/lxc/lxc-user-nic - ./config.status --file=%{buildroot}%{_bindir}/lxc-createconfig:%{S:2} chmod a+x %{buildroot}%{_bindir}/lxc-createconfig +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%name %clean %__rm -rf %buildroot @@ -126,6 +127,8 @@ %{_datadir}/lua/%name.lua %dir /var/lib/lxc %{_bindir}/%{name}-* +%{_sbindir}/init.lxc +%{_sbindir}/rclxc %{_mandir}/man[^3]/* %_unitdir/%{name}.service %python3_sitearch/%{name}/ ++++++ lxc-1.0.0.tar.gz -> lxc-1.0.3.tar.gz ++++++ ++++ 8452 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kstars for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at 2014-05-06 17:41:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kstars (Old) and /work/SRC/openSUSE:Factory/.kstars.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kstars" Changes: -------- --- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2014-04-18 12:35:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kstars.new/kstars.changes 2014-05-06 17:41:35.000000000 +0200 @@ -1,0 +2,7 @@ +Sun May 4 00:20:28 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added libqjson-devel BuildRequires: enables KStars to utilize + online web services to perform astrometric solving for images in + Ekos alignment module + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.3MfwOJ/_old 2014-05-06 17:41:36.000000000 +0200 +++ /var/tmp/diff_new_pack.3MfwOJ/_new 2014-05-06 17:41:36.000000000 +0200 @@ -31,6 +31,7 @@ BuildRequires: libindi BuildRequires: libindi-devel BuildRequires: libkde4-devel +BuildRequires: libqjson-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -38,8 +39,6 @@ BuildRequires: xz Recommends: libindi Recommends: xplanet -Provides: kde4-kstars = 4.3.0 -Obsoletes: kde4-kstars < 4.3.0 Provides: kstars-data = %{version} Obsoletes: kstars-data < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,9 +59,7 @@ %make_jobs %install -cd build -%kde4_makeinstall -cd .. +%kde4_makeinstall -C build # Remove static library rm -f %{buildroot}%{_kde4_libdir}/libhtmesh.a -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kopete for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package kopete for openSUSE:Factory checked in at 2014-05-06 17:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopete (Old) and /work/SRC/openSUSE:Factory/.kopete.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kopete" Changes: -------- --- /work/SRC/openSUSE:Factory/kopete/kopete.changes 2014-04-18 12:26:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kopete.new/kopete.changes 2014-05-06 17:41:27.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 3 23:17:19 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added BuildRequires previously pulled in via libkde4-devel: + giflib-devel, libidn-devel, libxml2-devel and libxslt-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopete.spec ++++++ --- /var/tmp/diff_new_pack.5BQVuP/_old 2014-05-06 17:41:28.000000000 +0200 +++ /var/tmp/diff_new_pack.5BQVuP/_new 2014-05-06 17:41:28.000000000 +0200 @@ -18,13 +18,17 @@ Name: kopete BuildRequires: alsa-devel +BuildRequires: giflib-devel BuildRequires: libgadu-devel +BuildRequires: libidn-devel BuildRequires: libjasper-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libmsn-devel BuildRequires: libqca2-devel BuildRequires: libqimageblitz-devel BuildRequires: libv4l-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel BuildRequires: meanwhile-devel BuildRequires: mediastreamer2-devel BuildRequires: openslp-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kfilemetadata for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package kfilemetadata for openSUSE:Factory checked in at 2014-05-06 17:41:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfilemetadata" Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata/kfilemetadata.changes 2014-04-18 12:37:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata.new/kfilemetadata.changes 2014-05-06 17:41:16.000000000 +0200 @@ -1,0 +2,10 @@ +Sat May 3 23:06:19 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added mobipocket-devel BuildRequires to add epub support + +------------------------------------------------------------------- +Fri May 2 10:27:24 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added optimize.patch: Optimize word count in PlainTextExtractor + +------------------------------------------------------------------- New: ---- optimize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata.spec ++++++ --- /var/tmp/diff_new_pack.UvMCS3/_old 2014-05-06 17:41:16.000000000 +0200 +++ /var/tmp/diff_new_pack.UvMCS3/_new 2014-05-06 17:41:16.000000000 +0200 @@ -23,10 +23,13 @@ License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 Group: System/GUI/KDE Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM optimize.patch -- Optimize word count in PlainTextExtractor +Patch0: optimize.patch BuildRequires: libepub-devel BuildRequires: libexiv2-devel BuildRequires: libkde4-devel BuildRequires: libpoppler-qt4-devel +BuildRequires: mobipocket-devel BuildRequires: taglib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,6 +47,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kde4 -d build ++++++ optimize.patch ++++++ From: Milian Wolff <mail(a)milianw.de> Date: Fri, 02 May 2014 09:53:33 +0000 Subject: Optimize word count in PlainTextExtractor. X-Git-Url: http://quickgit.kde.org/?p=kfilemetadata.git&a=commitdiff&h=a5b76bbd287d504… --- Optimize word count in PlainTextExtractor. Regular expressions are notoriously slow. Implementing a simple word-count directly in C++ is much faster, as shown by the benchmark: Before: RESULT : IndexerExtractorTests::benchMarkPlainTextExtractor(): 697.0 msecs per iteration (total: 6,970, iterations: 10) After: RESULT : IndexerExtractorTests::benchMarkPlainTextExtractor(): 88.2 msecs per iteration (total: 883, iterations: 10) REVIEW: 117789 --- --- a/src/extractors/plaintextextractor.cpp +++ b/src/extractors/plaintextextractor.cpp @@ -25,6 +25,32 @@ using namespace KFileMetaData; +namespace { +inline bool isWordCharacter(const QChar& c) +{ + // The Qt docs say for word characters: + // \w - Matches a word character (QChar::isLetterOrNumber(), QChar::isMark(), or '_'). + // see also: http://qt-project.org/doc/qt-4.8/qregexp.html + return c.isLetterOrNumber() || c.isMark() || c.unicode() == '_'; +} + +inline int countWords(const QString &string) +{ + int words = 0; + bool inWord = false; + foreach(QChar c, string) { + if (isWordCharacter(c) != inWord) { + inWord = !inWord; + if (inWord) { + ++words; + } + } + } + + return words; +} +} + PlainTextExtractor::PlainTextExtractor(QObject* parent, const QVariantList&) : ExtractorPlugin(parent) { @@ -48,15 +74,13 @@ int lines = 0; int words = 0; - QRegExp wordsRegex("\\b\\w+\\b"); - QTextStream ts(&file); while (!ts.atEnd()) { QString str = ts.readLine(); result->append(str); lines += 1; - words += str.count(wordsRegex); + words += countWords(str); } result->add(Property::WordCount, words); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2014-05-06 17:40:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2014-04-18 12:37:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2014-05-06 17:40:45.000000000 +0200 @@ -1,0 +2,5 @@ +Sun May 4 00:14:38 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added libxslt-devel, previously pulled in via libkde4-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.EuFKiz/_old 2014-05-06 17:40:46.000000000 +0200 +++ /var/tmp/diff_new_pack.EuFKiz/_new 2014-05-06 17:40:46.000000000 +0200 @@ -37,6 +37,7 @@ BuildRequires: libprison-devel BuildRequires: libpth-devel BuildRequires: libqjson-devel +BuildRequires: libxslt-devel BuildRequires: openldap2-devel BuildRequires: xz %if !0%{?sles_version} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2014-05-06 17:40:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2014-05-01 07:51:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2014-05-06 17:40:07.000000000 +0200 @@ -1,0 +2,11 @@ +Sun May 4 00:10:12 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added boost-devel >= 1.34.0, libakonadiprotocolinternals-devel >= 1.11.80, + libkde4-devel >= %{version}, libkolabxml-devel >= 1.0, libxslt-devel, + and shared-mime-info BuildRequires +- Drop akonadi.png, correct icon is now provided upstream +- Don't install libkdepim-copy.so, kdepim4-runtime has no development + components +- Recommend baloo-pim package + +------------------------------------------------------------------- Old: ---- akonadi.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.J9CPnB/_old 2014-05-06 17:40:09.000000000 +0200 +++ /var/tmp/diff_new_pack.J9CPnB/_new 2014-05-06 17:40:09.000000000 +0200 @@ -24,22 +24,24 @@ Group: System/GUI/KDE Url: http://www.kde.org Source0: kdepim-runtime-%{version}.tar.xz -Source1: akonadi.png # PATCH-FIX-UPSTREAM After migration also start using the already existing notes Patch1: use_existing_notes.diff +BuildRequires: boost-devel >= 1.34.0 BuildRequires: fdupes +BuildRequires: libakonadiprotocolinternals-devel >= 1.11.80 +BuildRequires: libkde4-devel >= %{version} BuildRequires: libkdepimlibs4-devel >= %{version} -BuildRequires: libkfbapi-devel -BuildRequires: libkgapi-devel -BuildRequires: libkolab-devel >= 0.2.0 +BuildRequires: libkfbapi-devel >= 1.0 +BuildRequires: libkgapi-devel >= 1.9.81 +BuildRequires: libkolab-devel >= 0.5.0 +BuildRequires: libkolabxml-devel >= 1.0 +BuildRequires: libxslt-devel +BuildRequires: shared-mime-info BuildRequires: xz Suggests: kontact -Obsoletes: kde4-akonadi < 4.2.90 -Provides: kde4-akonadi = 4.2.90 -Obsoletes: kdepim4-runtime-devel < 4.5.81svn1202101 -Provides: kdepim4-runtime-devel = 4.5.81svn1202101 -Obsoletes: akonadi-google <= 0.3.1 -Provides: akonadi-google = 0.3.1 +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +Recommends: baloo-pim >= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_akonadi_requires %kde4_pimlibs_requires @@ -60,12 +62,8 @@ %make_jobs %install - cd build - %kde4_makeinstall - cd .. + %kde4_makeinstall -C build #remove menu entries of development tools - mkdir -p %{buildroot}%{_kde4_datadir}/pixmaps - install $RPM_SOURCE_DIR/akonadi.png %{buildroot}%{_kde4_datadir}/pixmaps/ %suse_update_desktop_file -u akonaditray Network Email %fdupes -s %{buildroot} # remove stuff we don't want to package @@ -73,15 +71,16 @@ rm %{buildroot}%_kde4_libdir/libkmindexreader.so rm %{buildroot}%_kde4_libdir/libmaildir.so rm %{buildroot}%_kde4_libdir/libfolderarchivesettings.so + rm %{buildroot}%_kde4_libdir/libkdepim-copy.so %kde_post_install -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%clean - rm -rf %{buildroot} - rm -rf filelists +%post +/sbin/ldconfig +%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : + +%postun +/sbin/ldconfig +%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %files %defattr(-,root,root) @@ -98,10 +97,8 @@ %{_kde4_datadir}/autostart/kaddressbookmigrator.desktop %{_kde4_datadir}/dbus-1/interfaces/* %{_kde4_datadir}/mime/packages/*.xml -%{_kde4_datadir}/pixmaps/akonadi.png %{_kde4_iconsdir}/hicolor/*/apps/* %{_kde4_libdir}/libakonadi-filestore.so.4* -%{_kde4_libdir}/libkdepim-copy.so %{_kde4_libdir}/libkdepim-copy.so.4* %{_kde4_libdir}/libkmindexreader.so.4* %{_kde4_libdir}/libfolderarchivesettings.so.4* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2014-05-06 17:39:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2014-04-18 12:37:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2014-05-06 17:39:36.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 4 00:06:47 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added pkgconfig(bzip2) and libgcrypt-devel >= 1.5.0 BuildRequires, + previously pulled in via libkde4-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.AJvGy4/_old 2014-05-06 17:39:37.000000000 +0200 +++ /var/tmp/diff_new_pack.AJvGy4/_new 2014-05-06 17:39:37.000000000 +0200 @@ -44,9 +44,11 @@ BuildRequires: libattica-devel >= 0.1.4 BuildRequires: libcanberra-devel BuildRequires: libexiv2-devel +BuildRequires: libgcrypt-devel >= 1.5.0 BuildRequires: libgpgme-devel BuildRequires: libkactivities-devel >= %{version} BuildRequires: libkde4-devel >= %{version} +BuildRequires: pkgconfig(bzip2) #!BuildIgnore: kdebase4-runtime BuildRequires: libkdepimlibs4-devel >= %{version} BuildRequires: libksuseinstall-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0