Merge branch 'master' into epel7

.gitignore

@@ -14,3 +14,14 @@
 /kdeclarative-5.34.0.tar.xz
 /kdeclarative-5.35.0.tar.xz
 /kdeclarative-5.36.0.tar.xz
+/kdeclarative-5.37.0.tar.xz
+/kdeclarative-5.38.0.tar.xz
+/kdeclarative-5.39.0.tar.xz
+/kdeclarative-5.40.0.tar.xz
+/kdeclarative-5.41.0.tar.xz
+/kdeclarative-5.42.0.tar.xz
+/kdeclarative-5.43.0.tar.xz
+/kdeclarative-5.44.0.tar.xz
+/kdeclarative-5.45.0.tar.xz
+/kdeclarative-5.46.0.tar.xz
+/kdeclarative-5.47.0.tar.xz

kf5-kdeclarative.spec

@@ -8,11 +8,11 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 5.36.0
+Version: 5.47.0
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 3 addon for Qt declarative
 
-License: GPLv2+ and MIT
+License: LGPLv2+
 URL:     https://cgit.kde.org/%{framework}.git/
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
@@ -81,13 +81,13 @@ pushd %{_target_platform}
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang kdeclarative5_qt --with-qt --all-name
+%find_lang %{name} --all-name --with-html
 
 
 %check
@@ -100,12 +100,11 @@ make test ARGS="--output-on-failure --timeout 10 --verbose" -C %{_target_platfor
 %endif
 
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-%postun -p /sbin/ldconfig
 
-%files -f kdeclarative5_qt.lang
+%files -f %{name}.lang
 %doc README.md
-%license COPYING COPYING.LIB
+%license COPYING*
 %{_kf5_bindir}/kpackagelauncherqml
 %{_kf5_libdir}/libKF5Declarative.so.*
 %{_kf5_libdir}/libKF5QuickAddons.so.*
@@ -121,6 +120,7 @@ make test ARGS="--output-on-failure --timeout 10 --verbose" -C %{_target_platfor
 %{_kf5_qmldir}/org/kde/private/kquickcontrols/
 %{_kf5_qmldir}/org/kde/kio/
 %{_kf5_qmldir}/org/kde/kwindowsystem/
+%{_kf5_qmldir}/org/kde/kcm/
 
 %files devel
 %{_kf5_includedir}/kdeclarative_version.h
@@ -134,6 +134,67 @@ make test ARGS="--output-on-failure --timeout 10 --verbose" -C %{_target_platfor
 
 
 %changelog
+* Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
+- 5.47.0
+
+* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.46.0-2
+- rebuild (qt5)
+- use %%make_build %%ldconfig_scriptlets
+
+* Sat May 05 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.46.0-1
+- 5.46.0
+
+* Sun Apr 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.45.0-1
+- 5.45.0
+
+* Sat Mar 03 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.44.0-1
+- 5.44.0
+
+* Wed Feb 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.43.0-3
+- rebuild (qt5)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.43.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Feb 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.43.0-1
+- 5.43.0
+
+* Thu Jan 25 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.42.0-2
+- rebuild (qt5)
+
+* Mon Jan 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.42.0-1
+- 5.42.0
+
+* Wed Dec 20 2017 Jan Grulich <jgrulich@redhat.com> - 5.41.0-2
+- rebuild (qt5)
+
+* Mon Dec 04 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.41.0-1
+- 5.41.0
+
+* Sun Nov 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.40.0-2
+- rebuild (qt5)
+
+* Fri Nov 10 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.40.0-1
+- 5.40.0
+
+* Mon Oct 09 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.39.0-2
+- rebuild (qt5)
+
+* Sun Oct 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.39.0-1
+- 5.39.0
+
+* Mon Sep 11 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.38.0-1
+- 5.38.0
+
+* Fri Aug 25 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.37.0-1
+- 5.37.0
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.36.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.36.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Wed Jul 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.36.0-2
 - rebuild (qt5)
 

sources

@@ -1 +1 @@
-SHA512 (kdeclarative-5.36.0.tar.xz) = ca23c17bf46c7618b71e24dcf51c7bdb6f268e8eb6db9d25d144e8521988f605c17cce961abaf5815ffb2d998b10b0bce50f3e2707f49685ffb0b261a072ac0a
+SHA512 (kdeclarative-5.47.0.tar.xz) = fed58997c474d5648335b689b0ba650d4b3c6be6636ddd1db1bc5d2a5db1bed67880bb77224cff7c3dece1d1e38eca3da79ebea7c6b9949bfd8c059ef9506cc5