Merge branch f34 into epel8

.gitignore

@@ -21,3 +21,19 @@
 /kconfig-5.66.0.tar.xz
 /kconfig-5.67.0.tar.xz
 /kconfig-5.68.0.tar.xz
+/kconfig-5.69.0.tar.xz
+/kconfig-5.70.0.tar.xz
+/kconfig-5.71.0.tar.xz
+/kconfig-5.72.0.tar.xz
+/kconfig-5.73.0.tar.xz
+/kconfig-5.74.0.tar.xz
+/kconfig-5.75.0.tar.xz
+/kconfig-5.76.0.tar.xz
+/kconfig-5.77.0.tar.xz
+/kconfig-5.78.0.tar.xz
+/kconfig-5.79.0.tar.xz
+/kconfig-5.80.0.tar.xz
+/kconfig-5.81.0.tar.xz
+/kconfig-5.82.0.tar.xz
+/kconfig-5.83.0.tar.xz
+/kconfig-5.85.0.tar.xz

kf5-kconfig.spec

@@ -1,4 +1,5 @@
 %global framework kconfig
+%{!?docs: %global docs 1}
 
 # uncomment to enable bootstrap mode
 #global bootstrap 1
@@ -13,6 +14,9 @@
 %endif
 %endif
 #endif
+%if 0%{?flatpak}
+%global docs 0
+%endif
 %global tests 1
 %endif
 
@@ -20,12 +24,12 @@
 %global ninja 1
 
 Name:    kf5-%{framework}
-Version: 5.68.0
+Version: 5.85.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
 
 License: GPLv2+ and LGPLv2+ and MIT
-URL:     https://cgit.kde.org/%{framework}.git
+URL:     https://invent.kde.org/frameworks/%{framework}
 
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -105,6 +109,20 @@ 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%{?docs}
+%package doc
+Summary: API documentation for %{name}
+BuildRequires: doxygen
+BuildRequires: qt5-qdoc
+BuildRequires: qt5-qhelpgenerator
+BuildRequires: qt5-qtbase-doc
+BuildRequires: make
+Requires: kf5-filesystem
+BuildArch: noarch
+%description doc
+%{summary}.
+%endif
+
 %if 0%{?python_bindings}
 %package -n python2-pykf5-%{framework}
 Summary: Python2 bindings for %{framework}
@@ -137,26 +155,21 @@ PYTHONPATH=%{_datadir}/ECM/python
 export PYTHONPATH
 %endif
 
-mkdir %{_target_platform}
+%cmake_kf5 \
-pushd %{_target_platform}
+  %if 0%{?flatpak}
-%{cmake_kf5} .. \
+  %{?docs:-DBUILD_QCH:BOOL=OFF} \
+  %else
+  %{?docs:-DBUILD_QCH:BOOL=ON} \
+  %endif
   %{?ninja:-G Ninja} \
   %{?tests:-DBUILD_TESTING:BOOL=ON}
-popd
 
-%if 0%{?ninja}
+%cmake_build || \
-%ninja_build -C %{_target_platform}
+cat %{__cmake_builddir}/autotests/kconfig_compiler/test5.cpp
-%else
-%make_build -C %{_target_platform}
-%endif
 
 
 %install
-%if 0%{?ninja}
+%cmake_install
-%ninja_install -C %{_target_platform}
-%else
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%endif
 
 %find_lang_kf5 kconfig5_qt
 
@@ -167,16 +180,16 @@ export CTEST_OUTPUT_ON_FAILURE=1
 ## cant use %%ninja_test here for some reason, doesn't inherit env vars from xvfb or dbus -- rex
 xvfb-run -a \
 %if 0%{?ninja}
-ninja test -v -C %{_target_platform} ||:
+ninja test %{?_smp_mflags} -v -C redhat-linux-build ||:
 %else
-make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
+make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --timeout 300" ||:
 %endif
 %endif
 
 
 %files
 %doc DESIGN README.md TODO
-%license COPYING.LIB
+%license LICENSES/*.txt
 
 %ldconfig_scriptlets core
 
@@ -203,6 +216,12 @@ 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%{?docs}
+%files doc
+%{_qt5_docdir}/KF5Config.qch
+%{_qt5_docdir}/KF5Config.tags
+%endif
+
 %if 0%{?python_bindings}
 %files -n python2-pykf5-%{framework}
 %{python2_sitearch}/PyKF5/
@@ -216,6 +235,86 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 
 
 %changelog
+* Thu Aug 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.85.0-1
+- 5.85.0
+
+* Tue Jul 27 2021 Than Ngo <than@redhat.com> - 5.83.0-3
+- Fix FTBFS
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.83.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 08 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.83.0-1
+- 5.83.0
+
+* Mon May 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.82.0-1
+- 5.82.0
+
+* Tue Apr 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.81.0-1
+- 5.81.0
+
+* Sat Mar 20 2021 Onuralp SEZER <thunderbirdtr@fedoraproject.org> - 5.80.0-2
+- disabling docs for flatpak packages
+
+* Tue Mar 09 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.80.0-1
+- 5.80.0
+
+* Wed Feb 10 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-3
+- respin
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-2
+- respin
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-1
+- 5.79.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.78.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan  4 08:41:58 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78.0
+
+* Thu Dec 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-2
+- re-enable autotests to highlight possible gcc-11 bug (#1907799)
+
+* Sun Dec 13 14:09:46 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+- disable tests FTBFS
+
+* Thu Nov 19 08:57:32 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 09:48:40 CDT 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.75.0-1
+- 5.75.0
+
+* Fri Sep 18 2020 Jan Grulich <jgrulich@redhat.com> - 5.74.0-1
+- 5.74.0
+
+* Mon Aug 03 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-1
+- 5.73.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.72.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-3
+- -doc: Requires: kf5-filesystem
+
+* Tue Jul 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-2
+- use %%cmake macros more
+- enable -doc subpkg (qch docs)
+
+* Tue Jul 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-1
+- 5.72.0
+
+* Tue Jun 16 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.71.0-1
+- 5.71.0
+
+* Mon May 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.70.0-1
+- 5.70.0
+
+* Tue Apr 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.69.0-1
+- 5.69.0
+
 * Fri Mar 20 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-1
 - 5.68.0
 

sources

@@ -1 +1 @@
-SHA512 (kconfig-5.68.0.tar.xz) = f839b7a14a6d77060823e7892e4bbda7754ed501f374e4fbb4c10bb9061f182f7c426df55c64678d975e26e123ed3b8e0c791e762ff1077f6b058f214642a670
+SHA512 (kconfig-5.85.0.tar.xz) = 38cefed52e322be34bfd4b26a243b4f931442239a14bcb1f496f9223d2b87e05cdb9931a2aec9579b8bbe31d716bb6a1ce7901ba3cb525607bbef2aee7b96d52