diff --git a/.gitignore b/.gitignore index 6d26291..e2ee2b3 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,10 @@ /kconfig-5.86.0.tar.xz /kconfig-5.87.0.tar.xz /kconfig-5.88.0.tar.xz +/kconfig-5.89.0.tar.xz +/kconfig-5.90.0.tar.xz +/kconfig-5.91.0.tar.xz +/kconfig-5.92.0.tar.xz +./kconfig-5.93.tar.xz +/kconfig-5.94.0.tar.xz +/kconfig-5.96.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index e2ae0fa..4799feb 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -1,30 +1,24 @@ %global framework kconfig -%{!?docs: %global docs 1} # uncomment to enable bootstrap mode #global bootstrap 1 %if !0%{?bootstrap} -# FIXME/TODO: sip currently segfaults on s390x -%if 0%{?fedora} -%ifnarch ppc64 s390x -%if 0%{?fedora} < 29 -%global python_bindings 1 -%endif -%endif +#global docs 1 +#global python_bindings 1 +%global tests 1 + %endif -#endif + %if 0%{?flatpak} %global docs 0 %endif -%global tests 1 -%endif # use ninja instead of make %global ninja 1 Name: kf5-%{framework} -Version: 5.88.0 +Version: 5.96.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system @@ -51,26 +45,21 @@ BuildRequires: ninja-build BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros >= %{majmin} -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qttools-devel +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Qml) +BuildRequires: cmake(Qt5Xml) %if 0%{?python_bindings} -%if 0%{?fedora} && 0%{?fedora} < 27 -BuildRequires: bundled(python2-clang) >= 4.0.1 -%else -BuildRequires: python2-clang -%endif BuildRequires: clang BuildRequires: clang-devel -BuildRequires: python2-PyQt5-devel +BuildRequires: python3-clang BuildRequires: python3-PyQt5-devel %else -Obsoletes: python2-pykf5-%{framework} < %{version}-%{release} Obsoletes: python3-pykf5-%{framework} < %{version}-%{release} Obsoletes: pykf5-%{framework}-devel < %{version}-%{release} %endif +Obsoletes: python2-pykf5-%{framework} < %{version} %if 0%{?tests} BuildRequires: dbus-x11 @@ -124,12 +113,6 @@ BuildArch: noarch %endif %if 0%{?python_bindings} -%package -n python2-pykf5-%{framework} -Summary: Python2 bindings for %{framework} -Requires: %{name} = %{version}-%{release} -%description -n python2-pykf5-%{framework} -%{summary}. - %package -n python3-pykf5-%{framework} Summary: Python3 bindings for %{framework} Requires: %{name} = %{version}-%{release} @@ -197,7 +180,8 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time %{_kf5_datadir}/qlogging-categories5/%{framework}* %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 -%{_kf5_libdir}/libKF5ConfigCore.so.* +%{_kf5_libdir}/libKF5ConfigCore.so.5* +%{_kf5_libdir}/libKF5ConfigQml.so.5* %{_kf5_libexecdir}/kconfig_compiler_kf5 %{_kf5_libexecdir}/kconf_update @@ -207,11 +191,13 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time %{_kf5_libdir}/libKF5ConfigGui.so.* %files devel -%{_kf5_includedir}/kconfig_version.h +%{_kf5_includedir}/KConfig/ %{_kf5_includedir}/KConfigCore/ %{_kf5_includedir}/KConfigGui/ +%{_kf5_includedir}/KConfigQml/ %{_kf5_libdir}/libKF5ConfigCore.so %{_kf5_libdir}/libKF5ConfigGui.so +%{_kf5_libdir}/libKF5ConfigQml.so %{_kf5_libdir}/cmake/KF5Config/ %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigCore.pri %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri @@ -223,9 +209,6 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time %endif %if 0%{?python_bindings} -%files -n python2-pykf5-%{framework} -%{python2_sitearch}/PyKF5/ - %files -n python3-pykf5-%{framework} %{python3_sitearch}/PyKF5/ @@ -235,6 +218,33 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time %changelog +* Sun Jul 03 2022 Marc Deop - 5.96.0-1 +- 5.96.0 + +* Fri May 13 2022 Rex Dieter - 5.94.0-1 +- 5.94.0 + +* Sun Apr 10 2022 Justin Zobel - 5.93-1 +- Update to 5.93 + +* Thu Mar 10 2022 Rex Dieter - 5.92.0-1 +- 5.92.0 + +* Fri Feb 11 2022 Rex Dieter - 5.91.0-1 +- 5.91.0 + +* Thu Jan 20 2022 Fedora Release Engineering - 5.90.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 10 2022 Rex Dieter - 5.90.0-2 +- include Qml bindings + +* Tue Jan 04 2022 Marc Deop i Argemí (Private) - 5.90.0-1 +- 5.90.0 + +* Wed Dec 08 2021 Rex Dieter - 5.89.0-1 +- 5.89.0 + * Mon Nov 08 2021 Marc Deop - 5.88.0-1 - 5.88.0 diff --git a/sources b/sources index 1842a43..7f7ab1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.88.0.tar.xz) = 359517852ef5a19d75b829929bdd7b5932a5aadc7a7abfa85a43d968f5f4a3b268e3b2ce65d60528645181aa29efbf75ce9aadb78c9c9c693079b024699ba5c0 +SHA512 (kconfig-5.96.0.tar.xz) = 6eac947ce3392e0863faf7a67f9c161c652fa1eb4e7f508a42dc08ccc79c602c2946fb87feff0e5ac0cda626b1de910abf6218069f5e3910ec72700f7458743e