Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at 2013-12-11 14:32:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
and /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes
2013-12-02 12:31:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes
2013-12-11 14:32:29.000000000 +0100
@@ -1,0 +2,41 @@
+Mon Dec 9 21:54:21 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Small cleanup:
+ * Remove {?sles_version} and unsupported %{suse_version} checks
+ * Remove rpmlintrc file, it was used only for sles
+ * Remove alsa-devel and cups-devel requires from devel package,
+ they are not needed
+ * Remove grantlee-devel BuildRequires, it is needed only for tests,
+ which we don't build
+ * Adapt BuildRequires, and Requires to current requirements, as per
+ CMakeLists.txt
+ * Drop dubious kderev define
+ * Delete unused 0001-verbose.patch
+
+-------------------------------------------------------------------
+Fri Nov 29 06:59:36 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.11.97
+ * KDE 4.12 RC 1 release
+ * See http://www.kde.org/announcements/announce-4.12-rc.php
+
+-------------------------------------------------------------------
+Fri Nov 29 06:55:14 UTC 2013 - tittiatc...@gmail.com
+
+- Drop patch fix_kio_global_qfile_include.patch due to upstream
+ inclusion
+
+-------------------------------------------------------------------
+Sun Nov 24 15:22:18 UTC 2013 - ctri...@opensuse.org
+
+- Add fix_kio_global_qfile_include.patch to change the include of
+ QFile in kio/kio/global.h to be consistent with the other Qt includes
+
+-------------------------------------------------------------------
+Sat Nov 23 22:14:13 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.11.95
+ * KDE 4.12 Beta 3 release
+ * See http://www.kde.org/announcements/announce-4.12-beta3.php
+
+-------------------------------------------------------------------
kdelibs4.changes: same change
Old:
----
0001-verbose.patch
kdelibs-4.11.90.tar.xz
kdelibs4-rpmlintrc
New:
----
kdelibs-4.11.97.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.cXvLaD/_old 2013-12-11 14:32:30.000000000 +0100
+++ /var/tmp/diff_new_pack.cXvLaD/_new 2013-12-11 14:32:30.000000000 +0100
@@ -17,7 +17,7 @@
Name: kdelibs4-apidocs
-Version: 4.11.90
+Version: 4.11.97
Release: 0
Summary: KDE 4 API documentation
License: LGPL-2.1+
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.cXvLaD/_old 2013-12-11 14:32:30.000000000 +0100
+++ /var/tmp/diff_new_pack.cXvLaD/_new 2013-12-11 14:32:30.000000000 +0100
@@ -19,12 +19,8 @@
# a hack for building apidoc, currently unused and unneeded (rev.312)
%bcond_with gendoxygen
-# This is KDE revision number, setting it to a higher value will enable more
features
-# e.g. 420117248 enables kconfig_compiler.1
-%define kderev 0
-
Name: kdelibs4
-Version: 4.11.90
+Version: 4.11.97
Release: 0
BuildRequires: OpenEXR-devel
BuildRequires: automoc4
@@ -37,7 +33,6 @@
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: giflib-devel
-BuildRequires: grantlee-devel
BuildRequires: help2man
#Remove herqq support as this causes frequent crashes (bnc#768368)
#BuildRequires: herqq-devel
@@ -46,17 +41,15 @@
BuildRequires: krb5-devel
BuildRequires: libQtWebKit-devel
BuildRequires: libacl-devel
-BuildRequires: libattica-devel
+BuildRequires: libattica-devel >= 0.4.2
BuildRequires: libattr-devel
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libgssglue-devel
BuildRequires: libjasper-devel
-BuildRequires: libqt4-devel >= 4.8.0
-%if !0%{?sles_version}
BuildRequires: libpolkit-qt-1-devel
-%endif
-BuildRequires: libqca2-devel
-BuildRequires: libsoprano-devel
+BuildRequires: libqca2-devel >= 2.0.0
+BuildRequires: libqt4-devel >= 4.8.0
+BuildRequires: libsoprano-devel >= 2.7.56
BuildRequires: libudev-devel
BuildRequires: libxslt-devel
BuildRequires: pcre-devel
@@ -64,20 +57,12 @@
BuildRequires: shared-desktop-ontologies-devel >= 0.10.0
BuildRequires: shared-mime-info
BuildRequires: strigi
-BuildRequires: strigi-devel
+BuildRequires: strigi-devel >= 0.6.3
BuildRequires: update-desktop-files
-%if !0%{?sles_version}
BuildRequires: utempter-devel
-%else
-BuildRequires: utempter
-%endif
BuildRequires: xz
BuildRequires: xz-devel
-%if !0%{?sles_version}
BuildRequires: pkgconfig(bzip2)
-%else
-BuildRequires: libbz2-devel
-%endif
Summary: KDE Base Libraries
License: LGPL-2.1+
Group: System/GUI/KDE
@@ -87,9 +72,6 @@
Source2: hidden.desktop
Source3: ycp.xml
Source4: kde4rc
-%if 0%{?sles_version}
-Source99: kdelibs4-rpmlintrc
-%endif
Patch1: default-useragent.diff
Patch2: add-suse-translations.diff
Patch3: clever-menu.diff
@@ -105,16 +87,13 @@
# those libs are crashing(bnc#819437, kde#303576, kde#231077, qtbug#437)
Patch11: exclude-qtuitools-symbols-from-public-libraries.patch
PreReq: permissions
+Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%{VERSION}'
libattica-devel`)
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}'
libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}'
strigi-devel`)
Recommends: media-player-info
Requires: kdelibs4-core = %{version}
Requires: libkde4 = %{version}
-%if %{suse_version} > 1220
Requires: udisks2
-%else
-Requires: udisks
-%endif
Requires: upower
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
@@ -178,9 +157,7 @@
-DKDE4_ENABLE_FPIE=1 \
-DTEMPLATES_INSTALL_DIR=%{_kde4_sharedir}/templates \
-DHTML_INSTALL_DIR=%{_kde4_htmldir} \
-%if %{suse_version} > 1220
-DWITH_SOLID_UDISKS2=TRUE \
-%endif
-DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=%{_sysconfdir}"
%cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS
%make_jobs
@@ -193,13 +170,13 @@
done
%install
- cd build
- %kde4_makeinstall
+ %kde4_makeinstall -C build
chmod +x
%{buildroot}%{_kde4_appsdir}/kconf_update/ksslcertificatemanager.upd.sh
+ pushd build
%create_subdir_filelist -d kdecore -v kdecore.devel
%create_subdir_filelist -d kpty -f kdecore -v kdecore.devel
install -ma=r '-t%{buildroot}%{_kde4_mandir}/man1/' man1/*.1.gz
- cd ..
+ popd
%create_exclude_filelist
%if %{with gendoxygen}
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
@@ -225,9 +202,7 @@
/sbin/ldconfig
%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || :
-%if 0%{?suse_version} > 1130
%set_permissions %{_kde4_libexecdir}/start_kdeinit
-%endif
%postun
/sbin/ldconfig
@@ -295,9 +270,7 @@
Group: System/GUI/KDE
Requires: kde4-filesystem >= %{_kde_platform_version}
Requires: libkdecore4 = %{version}
-%if !0%{?sles_version}
%requires_ge libpolkit-qt-1-1
-%endif
%description -n kdelibs4-core
This package contains the basic packages of the K Desktop Environment.
@@ -344,11 +317,7 @@
%doc COPYING.LIB README
%{_kde4_bindir}/kconfig_compiler
%{_kde4_includedir}/kdemacros.h
-
-#pending upstream
-%if %{kderev} >= 420117248
%doc %{_kde4_mandir}/man1/kconfig_compiler.1.gz
-%endif
%package -n libkde4
Summary: KDE Base Libraries
@@ -370,11 +339,7 @@
%files branding-upstream
%defattr(-,root,root)
%doc COPYING.LIB
-%if %suse_version > 1200
%{_kde4_appsdir}/kdeui/about
-%else
-%{_kde4_appsdir}/kdeui/about/body-background.png
-%endif
%files -n libkde4
%defattr(-,root,root)
@@ -421,9 +386,7 @@
License: LGPL-2.1+
Group: Development/Libraries/KDE
Requires: OpenEXR-devel
-Requires: alsa-devel
Requires: avahi-compat-mDNSResponder-devel
-Requires: cups-devel
Requires: docbook-xsl-stylesheets
Requires: enchant-devel
Requires: fam-devel
@@ -437,9 +400,7 @@
Requires: libidn-devel
Requires: libkde4 = %{version}
Requires: libkdecore4-devel = %{version}
-%if !0%{?sles_version}
Requires: libpolkit-qt-1-devel
-%endif
Requires: libsoprano-devel
Requires: libxslt-devel
Requires: pcre-devel
@@ -447,15 +408,7 @@
Requires: shared-desktop-ontologies-devel >= 0.10
Requires: strigi-devel
Requires: update-desktop-files
-%if !0%{?sles_version}
Requires: pkgconfig(libxml-2.0)
-%else
-Requires: libxml2-devel
-%endif
-Provides: libknotificationitem-devel = 4.3.66svn1016707
-Obsoletes: libknotificationitem-devel < 4.3.66svn1016707
-Provides: kde4-webkitpart-devel = 4.3.73svn1042829
-Obsoletes: kde4-webkitpart-devel < 4.3.73svn1042829
%description -n libkde4-devel
This package contains all necessary include files and libraries needed
@@ -478,12 +431,7 @@
%files -f filelists/exclude
%defattr(-,root,root)
-# not all rpm versions handle "caps"
-%if !0%{?sles_version}
- %verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit
-%else
-%verify(not mode) %attr(755,root,root) %{_kde4_libexecdir}/start_kdeinit
-%endif
+%verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit
%{_kde4_configdir}/*
%config %{_kde4_sysconfdir}/xdg/menus/applications.menu.kde4
@@ -500,11 +448,7 @@
%doc %lang(en) %{_kde4_htmldir}/en/sonnet
%exclude %{_kde4_appsdir}/cmake
-%if %suse_version > 1200
%exclude %{_kde4_appsdir}/kdeui/about
-%else
-%exclude %{_kde4_appsdir}/kdeui/about/body-background.png
-%endif
%exclude %{_kde4_appsdir}/ksgmltools2
%exclude %{_kde4_bindir}/meinproc4
%exclude %{_kde4_bindir}/meinproc4_simple
@@ -530,10 +474,7 @@
%doc %{_kde4_mandir}/man*/*
%exclude %{_kde4_mandir}/man1/kde4-config.1.gz
%exclude %{_kde4_mandir}/man1/meinproc4.1.gz
-
-%if %{kderev} >= 420117248
%exclude %{_kde4_mandir}/man1/kconfig_compiler.1.gz
-%endif
%{_kde4_modulesdir}/*
%{_kde4_servicesdir}/*
++++++ kdelibs-4.11.90.tar.xz -> kdelibs-4.11.97.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.11.90.tar.xz
/work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.11.97.tar.xz differ: char
28, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
