From 6b1c8003f62350c1b9fd285a4e6691204819fc02 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: May 02 2020 16:26:39 +0000 Subject: Merge branch f32 into epel8 --- diff --git a/.gitignore b/.gitignore index ce5d221..8bb9758 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,12 @@ /kdesignerplugin-5.57.0.tar.xz /kdesignerplugin-5.58.0.tar.xz /kdesignerplugin-5.59.0.tar.xz +/kdesignerplugin-5.60.0.tar.xz +/kdesignerplugin-5.61.0.tar.xz +/kdesignerplugin-5.62.0.tar.xz +/kdesignerplugin-5.63.0.tar.xz +/kdesignerplugin-5.64.0.tar.xz +/kdesignerplugin-5.65.0.tar.xz +/kdesignerplugin-5.66.0.tar.xz +/kdesignerplugin-5.67.0.tar.xz +/kdesignerplugin-5.68.0.tar.xz diff --git a/kf5-kdesignerplugin.spec b/kf5-kdesignerplugin.spec index 5f19bd1..cf50f85 100644 --- a/kf5-kdesignerplugin.spec +++ b/kf5-kdesignerplugin.spec @@ -4,7 +4,7 @@ #global bootstrap 1 Name: kf5-%{framework} -Version: 5.59.0 +Version: 5.68.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module for Qt Designer @@ -42,11 +42,6 @@ BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} BuildRequires: kf5-kxmlgui-devel >= %{majmin} BuildRequires: kf5-sonnet-devel >= %{majmin} -%if ! 0%{?bootstrap} -BuildRequires: qt5-qtwebkit-devel -BuildRequires: kf5-kdewebkit-devel >= %{majmin} -%endif - Obsoletes: kf5-kdesignerplugin-devel < 5.18.0-2 Provides: kf5-kdesignerplugin-devel = %{version}-%{release} @@ -86,18 +81,48 @@ cat kdesignerplugin5_qt.lang %{name}-man.lang > %{name}.lang %doc README.md %license COPYING.LIB %{_kf5_bindir}/kgendesignerplugin -%{_kf5_qtplugindir}/designer/kf5widgets.so -%if !0%{?bootstrap} -%{_kf5_qtplugindir}/designer/kdewebkit5widgets.so -%endif -%dir %{_kf5_datadir}/kf5/widgets/ -%{_kf5_datadir}/kf5/widgets/* +#{_kf5_qtplugindir}/designer/kf5widgets.so +#dir %{_kf5_datadir}/kf5/widgets/ +#{_kf5_datadir}/kf5/widgets/* %{_kf5_mandir}/man1/kgendesignerplugin.1* # runtime config, no need for -devel pkg %{_kf5_libdir}/cmake/KF5DesignerPlugin/ %changelog +* 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-1 +- 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 dda6b8c..7983029 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdesignerplugin-5.59.0.tar.xz) = d860210f43e499d957184b43f6d3ba8f3f2c8d5af4349f2133551990e2062206304499f43053e6669ba68b6ff3cf2aeabb794672a55cbacae61a76ab22b02eb6 +SHA512 (kdesignerplugin-5.68.0.tar.xz) = b8d7103e223274377a109a961530ea0c5aa630134467b4baaf3c26b762319aac62f34357512e9a6c0fed9dacf61c1f71521f0a08d947cc5f2b845257a3e5faef