diff --git a/.gitignore b/.gitignore index 66e2444..58281a0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,12 @@ /kconfig-5.57.0.tar.xz /kconfig-5.58.0.tar.xz /kconfig-5.59.0.tar.xz +/kconfig-5.60.0.tar.xz +/kconfig-5.61.0.tar.xz +/kconfig-5.62.0.tar.xz +/kconfig-5.63.0.tar.xz +/kconfig-5.64.0.tar.xz +/kconfig-5.65.0.tar.xz +/kconfig-5.66.0.tar.xz +/kconfig-5.67.0.tar.xz +/kconfig-5.68.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 306e8eb..5b49f31 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -8,7 +8,7 @@ %if 0%{?fedora} %ifnarch ppc64 s390x %if 0%{?fedora} < 29 -%global python 1 +%global python_bindings 1 %endif %endif %endif @@ -20,8 +20,8 @@ %global ninja 1 Name: kf5-%{framework} -Version: 5.59.0 -Release: 1%{?dist}.1 +Version: 5.68.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -37,7 +37,6 @@ URL: https://cgit.kde.org/%{framework}.git Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches -Patch12: 0012-Security-remove-support-for-.-in-config-keys-with-e-.patch ## upstreamable patches @@ -53,7 +52,7 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel -%if 0%{?python} +%if 0%{?python_bindings} %if 0%{?fedora} && 0%{?fedora} < 27 BuildRequires: bundled(python2-clang) >= 4.0.1 %else @@ -106,7 +105,7 @@ KConfigGui provides a way to hook widgets to the configuration so that they are automatically initialized from the configuration and automatically propagate their changes to their respective configuration files. -%if 0%{?python} +%if 0%{?python_bindings} %package -n python2-pykf5-%{framework} Summary: Python2 bindings for %{framework} Requires: %{name} = %{version}-%{release} @@ -133,7 +132,7 @@ BuildArch: noarch %build -%if 0%{?python:1} +%if 0%{?python_bindings:1} PYTHONPATH=%{_datadir}/ECM/python export PYTHONPATH %endif @@ -182,6 +181,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %ldconfig_scriptlets core %files core -f kconfig5_qt.lang +%{_kf5_datadir}/qlogging-categories5/%{framework}* %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 %{_kf5_libdir}/libKF5ConfigCore.so.* @@ -203,7 +203,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigCore.pri %{_kf5_archdatadir}/mkspecs/modules/qt_KConfigGui.pri -%if 0%{?python} +%if 0%{?python_bindings} %files -n python2-pykf5-%{framework} %{python2_sitearch}/PyKF5/ @@ -216,8 +216,38 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: %changelog -* Thu Aug 08 2019 Rex Dieter - 5.59.0-1.1 -- (branch backport) upstream fix for CVE-2019-14744 (#1738901) +* Fri Mar 20 2020 Rex Dieter - 5.68.0-1 +- 5.68.0 + +* Sun Feb 02 2020 Rex Dieter - 5.67.0-1 +- 5.67.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 5.66.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 07 2020 Rex Dieter +- 5.66.0 + +* Tue Dec 17 2019 Rex Dieter - 5.65.0-1 +- 5.65.0 + +* Fri Nov 08 2019 Rex Dieter - 5.64.0-1 +- 5.64.0 + +* Tue Oct 22 2019 Rex Dieter - 5.63.0-1 +- 5.63.0 + +* Mon Sep 16 2019 Rex Dieter - 5.62.0-1 +- 5.62.0 + +* Wed Aug 07 2019 Rex Dieter - 5.61.0-1 +- 5.61.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 5.60.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jul 13 2019 Rex Dieter - 5.60.0-1 +- 5.60.0 * Thu Jun 06 2019 Rex Dieter - 5.59.0-1 - 5.59.0 diff --git a/sources b/sources index 98bebda..9b3f86a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfig-5.59.0.tar.xz) = c8f21979e3508b9bf1b695a22e4843ff0d311db957817fcc3bbc5c65e397c7e2a0ed8fb2f1194fea79e90a5369f52d758bb684354b9d9e1856dd9552e5f837e7 +SHA512 (kconfig-5.68.0.tar.xz) = f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670