Hello community, here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory checked in at 2015-03-11 09:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old) and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes 2014-07-10 14:56:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes 2015-03-11 09:58:34.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 9 17:50:06 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 1.8.19~git20150303 + * Added KF5 config module +- Drop sync_to_master.diff, merged upstream +- Added extra-cmake-modules, karchive-devel, kconfig-devel, + kconfigwidgets-devel, kdelibs4support-devel, ki18n-devel, kio-devel, + kwidgetsaddons-devel and kxmlgui-devel BuildRequires +- Drop openSUSE 13.1 support (too old cmake and Qt5, missing KF5) + +------------------------------------------------------------------- Old: ---- qtcurve-1.8.18.tar.gz sync_to_master.diff New: ---- qtcurve-1.8.19~git20150303.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.8NVdti/_old 2015-03-11 09:58:35.000000000 +0100 +++ /var/tmp/diff_new_pack.8NVdti/_new 2015-03-11 09:58:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qtcurve-kde4 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,28 @@ # +%bcond_with lang Name: qtcurve-kde4 -Version: 1.8.18 +Version: 1.8.19~git20150303 Release: 0 Summary: QtCurve style for KDE 4 License: LGPL-2.1+ Group: System/GUI/KDE Url: https://github.com/QtCurve/qtcurve -Source0: qtcurve-%{version}.tar.gz -# PATCH-FIX-UPSTREAM sync_to_master.diff -- added various bugfixes from master branch/commit ca1160474 -Patch0: sync_to_master.diff +Source: qtcurve-%{version}.tar.xz +BuildRequires: cmake >= 2.8.12 +BuildRequires: extra-cmake-modules BuildRequires: gtk2-devel +BuildRequires: karchive-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel BuildRequires: kdebase4-workspace-devel -BuildRequires: pkgconfig(x11-xcb) -BuildRequires: pkgconfig(xcb) -%if %suse_version > 1230 +BuildRequires: kdelibs4support-devel +BuildRequires: ki18n-devel +BuildRequires: kio-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: libQt5Widgets-private-headers-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) @@ -38,13 +45,9 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -%if %suse_version > 1310 -BuildRequires: libQt5Widgets-private-headers-devel -%else -BuildRequires: libqt5-qtbase-private-headers-devel -%endif -%endif -Requires: libqtcurve-utils1 = %{version} +BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xcb) +Requires: libqtcurve-utils2 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -52,20 +55,20 @@ This is the QtCurve style for KDE 4. QtCurve is available for both Gtk2+ and Qt3. -%package -n libqtcurve-utils1 +%package -n libqtcurve-utils2 Summary: QtCurve style for KDE 4 Group: System/GUI/KDE -%description -n libqtcurve-utils1 +%description -n libqtcurve-utils2 This is the QtCurve style for KDE 4. QtCurve is available for both Gtk2+ and Qt3. This package cointans basic helper library needed for qtcurve -%package -n libqtcurve-cairo0 +%package -n libqtcurve-cairo1 Summary: QtCurve style for KDE 4 Group: System/GUI/KDE -%description -n libqtcurve-cairo0 +%description -n libqtcurve-cairo1 This is the QtCurve style for KDE 4. QtCurve is available for both Gtk2+ and Qt3. This package cointans library for common drawing routines @@ -73,13 +76,12 @@ %package -n qtcurve-gtk2 Summary: QtCurve style for GTK+ 2 Group: System/GUI/GNOME -Requires: libqtcurve-cairo0 = %{version} +Requires: libqtcurve-cairo1 = %{version} %description -n qtcurve-gtk2 This package contains the QtCurve engine for GTK+ 2. QtCurve is a set of widget styles available for Qt and GTK+. -%if %suse_version > 1230 %package -n qtcurve-qt5 Summary: QtCurve style for Qt 5 Group: System/GUI/KDE @@ -87,52 +89,48 @@ %description -n qtcurve-qt5 This package contains the QtCurve style for Qt 5. QtCurve is a set of widget styles available for Qt and GTK+. -%endif %prep %setup -q -n qtcurve-%{version} -%patch0 -p1 %build -%if %suse_version > 1230 - %cmake_kde4 -d build -- -DENABLE_QT5=ON -DENABLE_GTK2=ON -%else - %cmake_kde4 -d build -- -DENABLE_QT5=OFF -DENABLE_GTK2=ON -%endif + %cmake_kde4 -d build -- -DENABLE_QT5=ON -DQTC_QT5_ENABLE_KDE=ON %make_jobs %install pushd build %make_install popd +%if %{with lang} %find_lang qtcurve +%endif %kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%post -n libqtcurve-utils1 -p /sbin/ldconfig +%post -n libqtcurve-utils2 -p /sbin/ldconfig -%postun -n libqtcurve-utils1 -p /sbin/ldconfig +%postun -n libqtcurve-utils2 -p /sbin/ldconfig -%post -n libqtcurve-cairo0 -p /sbin/ldconfig +%post -n libqtcurve-cairo1 -p /sbin/ldconfig -%postun -n libqtcurve-cairo0 -p /sbin/ldconfig +%postun -n libqtcurve-cairo1 -p /sbin/ldconfig -%files -n libqtcurve-utils1 +%files -n libqtcurve-utils2 %defattr(-,root,root) %{_kde4_libdir}/libqtcurve-utils.so.* # We don't need the devel symlink %exclude %{_kde4_libdir}/libqtcurve-utils.so -%files -n libqtcurve-cairo0 +%files -n libqtcurve-cairo1 %defattr(-,root,root) %{_kde4_libdir}/libqtcurve-cairo.so.* # We don't need the devel symlink %exclude %{_kde4_libdir}/libqtcurve-cairo.so -%files -f qtcurve.lang +%files %defattr(-,root,root) %doc ChangeLog.md COPYING README.md TODO.md %{_kde4_modulesdir}/kstyle_qtcurve_config.so @@ -145,17 +143,21 @@ %{_kde4_appsdir}/color-schemes/QtCurveAgua.colors %{_kde4_appsdir}/kwin/qtcurve.desktop +%if %{with lang} +%files lang -f qtcurve.lang +%defattr(-,root,root) +%endif + %files -n qtcurve-gtk2 %defattr(-,root,root) %doc ChangeLog.md COPYING README.md TODO.md %{_kde4_libdir}/gtk-2.0/*/engines/libqtcurve.* %{_kde4_datadir}/themes/QtCurve/ -%if %suse_version > 1230 %files -n qtcurve-qt5 %defattr(-,root,root) %doc ChangeLog.md COPYING README.md TODO.md %{_libqt5_plugindir}/ -%endif +%{_kf5_sharedir}/kstyle/ %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
