From 24264f9fe204235d83c46f14720ff9872aa73b82 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 05 2016 16:11:49 +0000
Subject: cleanup, use %license, -libs: Recommends: cups-client ghostscript-core


---

diff --git a/.gitignore b/.gitignore
index ab3c703..5da2590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1 @@
-/okular-4.14.2.tar.xz
-/okular-4.14.3.tar.xz
-/okular-14.11.97.tar.xz
-/okular-14.12.1.tar.xz
-/okular-14.12.2.tar.xz
-/okular-14.12.3.tar.xz
-/okular-15.04.0.tar.xz
-/okular-15.04.1.tar.xz
-/okular-15.04.2.tar.xz
-/okular-15.08.0.tar.xz
-/okular-15.08.1.tar.xz
-/okular-15.08.3.tar.xz
 /okular-15.12.1.tar.xz
diff --git a/okular.spec b/okular.spec
index 315a12d..f884df5 100644
--- a/okular.spec
+++ b/okular.spec
@@ -15,10 +15,10 @@
 Name:    okular 
 Summary: A document viewer
 Version: 15.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
-URL:     https://projects.kde.org/projects/kde/kdegraphics/okular
+URL:     https://projects.kde.org/okular
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
@@ -105,11 +105,11 @@ Requires: kdelibs4-devel
 Summary:  Runtime files for %{name} 
 # when split occurred
 Conflicts: kdegraphics < 7:4.6.95-10
-## not sure if we want all these explicitly or not -- rex
-# lpr
-#Requires: cups
-#Requires: %{_bindir}/ps2pdf
-#Requires: %{_bindir}/pdf2ps
+# use Recommends to avoid hard deps -- rex
+## lpr
+Recommends: cups-client
+## ps2pdf,pdf2ps
+Recommends: ghostscript-core
 %description libs 
 %{summary}.
 
@@ -135,8 +135,9 @@ Summary: A kioslave for displaying WinHelp files
 %patch52 -p1 -b .overflow
 %patch53 -p1 -b .cmake
 
+
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -147,8 +148,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
 %if ! 0%{?active}
 rm -fv %{buildroot}%{_kde4_datadir}/applications/kde4/active-documentviewer_*.desktop
 %endif
@@ -179,12 +178,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 fi
 
-%files -f %{name}.lang
-%doc COPYING 
+%files
+%license COPYING
 %{_kde4_bindir}/okular*
 %{_kde4_datadir}/applications/kde4/okular.desktop
 %{_kde4_datadir}/applications/kde4/okularApplication_*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
+%lang(en) %{_kde4_docdir}/HTML/en/okular/
 %{_mandir}/man1/okular.1*
 
 %if 0%{?active}
@@ -207,7 +207,7 @@ fi
 
 %files libs
 %{_kde4_appsdir}/kconf_update/okular.upd
-%{_kde4_libdir}/libokularcore.so.6*
+%{_kde4_libdir}/libokularcore.so.7*
 
 %files part
 %{_kde4_appsdir}/okular/
@@ -218,6 +218,7 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop
 %{_kde4_libdir}/kde4/okularGenerator*.so
 %{_kde4_libdir}/kde4/okularpart.so
+
 %if 0%{?chm}
 %files -n kio_msits
 %{_kde4_libdir}/kde4/kio_msits.so
@@ -226,6 +227,9 @@ fi
 
 
 %changelog
+* Fri Feb 05 2016 Rex Dieter <rdieter@fedoraproject.org> 15.12.1-3
+- cleanup, use %%license, -libs: Recommends: cups-client ghostscript-core
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 15.12.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild