From 8ef3d9024b03923524c565bef017928b9195d2d3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 14 Jan 2016 12:22:23 -0600
Subject: [PATCH] cosmetics, update URL, use %license

---
 .gitignore       | 19 -------------------
 kf5-kxmlgui.spec | 36 ++++++++++++++++--------------------
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index e088d9d..bd6b799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1 @@
-/kxmlgui-4.100.0.tar.xz
-/kxmlgui-5.0.0.tar.xz
-/kxmlgui-5.1.0.tar.xz
-/kxmlgui-5.2.0.tar.xz
-/kxmlgui-5.3.0.tar.xz
-/kxmlgui-5.4.0.tar.xz
-/kxmlgui-5.5.0.tar.xz
-/kxmlgui-5.6.0.tar.xz
-/kxmlgui-5.7.0.tar.xz
-/kxmlgui-5.8.0.tar.xz
-/kxmlgui-5.9.0.tar.xz
-/kxmlgui-5.10.0.tar.xz
-/kxmlgui-5.11.0.tar.xz
-/kxmlgui-5.12.0.tar.xz
-/kxmlgui-5.13.0.tar.xz
-/kxmlgui-5.14.0.tar.xz
-/kxmlgui-5.15.0.tar.xz
-/kxmlgui-5.16.0.tar.xz
-/kxmlgui-5.17.0.tar.xz
 /kxmlgui-5.18.0.tar.xz
diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec
index 746995f..b0292b7 100644
--- a/kf5-kxmlgui.spec
+++ b/kf5-kxmlgui.spec
@@ -2,11 +2,11 @@
 
 Name:           kf5-%{framework}
 Version:        5.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 solution for user-configurable main windows
 
 License:        GPLv2+ and LGPLv2+
-URL:            http://www.kde.org
+URL:            http://projects.kde.org/kxmlgui
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -17,29 +17,22 @@ URL:            http://www.kde.org
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
-## upstream patches
-
-BuildRequires:  libX11-devel
-
-BuildRequires:  kf5-rpm-macros >= %{version}
 BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  qt5-qtbase-devel
+BuildRequires:  kf5-attica-devel >= %{version}
 BuildRequires:  kf5-kconfig-devel >= %{version}
-BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-
-
-BuildRequires:  kf5-kitemviews-devel >= %{version}
-# session mangement patch needs new api
 BuildRequires:  kf5-kconfig-devel >= %{version}
-Requires:       kf5-kconfig-core%{?_isa} >= 5.9.0-3
-BuildRequires:  kf5-kglobalaccel-devel >= %{version}
 BuildRequires:  kf5-kconfigwidgets-devel >= %{version}
+BuildRequires:  kf5-kcoreaddons-devel >= %{version}
+BuildRequires:  kf5-kglobalaccel-devel >= %{version}
 BuildRequires:  kf5-ki18n-devel >= %{version}
 BuildRequires:  kf5-kiconthemes-devel >= %{version}
+BuildRequires:  kf5-kitemviews-devel >= %{version}
 BuildRequires:  kf5-ktextwidgets-devel >= %{version}
 BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
 BuildRequires:  kf5-kwindowsystem-devel >= %{version}
-BuildRequires:  kf5-attica-devel >= %{version}
+BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  libX11-devel
+BuildRequires:  qt5-qtbase-devel
 
 Requires:       kf5-filesystem >= %{version}
 
@@ -52,7 +45,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       kf5-kconfig-devel >= %{version}
 Requires:       kf5-kconfigwidgets-devel >= %{version}
 Requires:       qt5-qtbase-devel
-
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -83,7 +75,8 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kf5/kxmlgui
 %postun -p /sbin/ldconfig
 
 %files -f kxmlgui5_qt.lang
-%doc COPYING COPYING.LIB README.md
+%doc README.md
+%license COPYING COPYING.LIB
 %config %{_kf5_sysconfdir}/xdg/ui/ui_standards.rc
 %{_kf5_libdir}/libKF5XmlGui.so.*
 %{_kf5_libexecdir}/ksendbugmail
@@ -91,13 +84,16 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kf5/kxmlgui
 
 %files devel
 %{_kf5_includedir}/kxmlgui_version.h
-%{_kf5_includedir}/KXmlGui
+%{_kf5_includedir}/KXmlGui/
 %{_kf5_libdir}/libKF5XmlGui.so
-%{_kf5_libdir}/cmake/KF5XmlGui
+%{_kf5_libdir}/cmake/KF5XmlGui/
 %{_kf5_archdatadir}/mkspecs/modules/qt_KXmlGui.pri
 
 
 %changelog
+* Thu Jan 14 2016 Rex Dieter <rdieter@fedoraproject.org> 5.18.0-2
+- cosmetics, update URL, use %%license
+
 * Sun Jan 03 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.18.0-1
 - KDE Frameworks 5.18.0