From 7312c835d782f35034f4f50118d9e76c552efc84 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 14 Jan 2016 10:13:57 -0600
Subject: [PATCH] cosmetics, update URL, use %license

---
 .gitignore     | 19 -------------------
 kf5-khtml.spec | 47 +++++++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index 551fd66..ca9e0c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1 @@
-/khtml-4.100.0.tar.xz
-/khtml-5.0.0.tar.xz
-/khtml-5.1.0.tar.xz
-/khtml-5.2.0.tar.xz
-/khtml-5.3.0.tar.xz
-/khtml-5.4.0.tar.xz
-/khtml-5.5.0.tar.xz
-/khtml-5.6.0.tar.xz
-/khtml-5.7.0.tar.xz
-/khtml-5.8.0.tar.xz
-/khtml-5.9.0.tar.xz
-/khtml-5.10.0.tar.xz
-/khtml-5.11.0.tar.xz
-/khtml-5.12.0.tar.xz
-/khtml-5.13.0.tar.xz
-/khtml-5.14.0.tar.xz
-/khtml-5.15.0.tar.xz
-/khtml-5.16.0.tar.xz
-/khtml-5.17.0.tar.xz
 /khtml-5.18.0.tar.xz
diff --git a/kf5-khtml.spec b/kf5-khtml.spec
index 89b0d56..42a44c2 100644
--- a/kf5-khtml.spec
+++ b/kf5-khtml.spec
@@ -2,11 +2,11 @@
 
 Name:           kf5-%{framework}
 Version:        5.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Frameworks 5 Tier 4 solution with KHTML, a HTML rendering engine
 
 License:        LGPLv2+ and GPLv3 and MIT and BSD
-URL:            http://www.kde.org
+URL:            http://projects.kde.org/khtml
 
 %global versiondir %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -17,24 +17,9 @@ URL:            http://www.kde.org
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/portingAids/%{framework}-%{version}.tar.xz
 
+BuildRequires:  extra-cmake-modules >= %{version}
 BuildRequires:  fdupes
 BuildRequires:  giflib-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  openssl-devel
-BuildRequires:  perl
-BuildRequires:  libpng-devel
-BuildRequires:  zlib-devel
-
-%if %{fedora} >= 24
-BuildRequires:  perl-Getopt-Long
-%endif
-
-BuildRequires:  kf5-rpm-macros >= %{version}
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qtx11extras-devel
-BuildRequires:  phonon-qt5-devel
-
 BuildRequires:  kf5-karchive-devel >= %{version}
 BuildRequires:  kf5-kcodecs-devel >= %{version}
 BuildRequires:  kf5-kglobalaccel-devel >= %{version}
@@ -49,7 +34,16 @@ BuildRequires:  kf5-kwallet-devel >= %{version}
 BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
 BuildRequires:  kf5-kwindowsystem-devel >= %{version}
 BuildRequires:  kf5-kxmlgui-devel >= %{version}
+BuildRequires:  kf5-rpm-macros >= %{version}
 BuildRequires:  kf5-sonnet-devel >= %{version}
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  openssl-devel
+BuildRequires:  perl perl(Getopt::Long)
+BuildRequires:  phonon-qt5-devel
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtx11extras-devel
+BuildRequires:  zlib-devel
 
 Requires:       kf5-filesystem >= %{version}
 
@@ -67,7 +61,6 @@ Requires:       kf5-kparts-devel >= %{version}
 Requires:       qt5-qtbase-devel
 Requires:       kf5-ktextwidgets-devel >= %{version}
 Requires:       kf5-kcodecs-devel >= %{version}
-
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -77,15 +70,18 @@ developing applications that use %{name}.
 %setup -q -n %{framework}-%{version}
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
+%{cmake_kf5} .. \
+  -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
 %find_lang khtml5_qt --with-qt --all-name
 
 
@@ -93,7 +89,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %postun -p /sbin/ldconfig
 
 %files -f khtml5_qt.lang
-%doc COPYING.GPL3 COPYING.LIB README.md
+%doc README.md
+%license COPYING.GPL3 COPYING.LIB
 %{_kf5_libdir}/libKF5KHtml.so.*
 %{_kf5_plugindir}/parts/*.so
 %{_kf5_datadir}/kf5/kjava/
@@ -103,15 +100,17 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %config %{_kf5_sysconfdir}/xdg/khtmlrc
 
 %files devel
-%doc
 %{_kf5_libdir}/libKF5KHtml.so
-%{_kf5_libdir}/cmake/KF5KHtml
+%{_kf5_libdir}/cmake/KF5KHtml/
 %{_kf5_includedir}/KHtml/
 %{_kf5_includedir}/khtml_version.h
 %{_kf5_archdatadir}/mkspecs/modules/qt_KHtml.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