From b111d1e942884be210ed4ba411a40160fe23ddb6 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Oct 11 2015 16:47:36 +0000
Subject: Update to 7.3


- Build only the qt version, since kde4 is obsolete in Fedora and kchmviewer
  no longer uses KHTML
- BR added: gcc-c++, qt4-devel; BR removed: perl, openssl-devel, phonon-devel

---

diff --git a/.gitignore b/.gitignore
index b8c67ea..163f1ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ kchmviewer-5.2.tar.gz
 /kchmviewer-5.3.tar.gz
 /kchmviewer-6.0.tar.gz
 /kchmviewer-7.1.tar.gz
+/kchmviewer-7.3.tar.gz
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 88662a3..ab0a50c 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -1,21 +1,20 @@
 Name:           kchmviewer
-Version:        7.1
-Release:        5%{?dist}
+Version:        7.3
+Release:        1%{?dist}
 Summary:        CHM viewer
 
 Group:          Applications/Publishing
 License:        GPLv3+
 URL:            http://www.kchmviewer.net/
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
+Provides:       %{name}-qt = %{version}-%{release}
+Obsoletes:      %{name}-qt < 7.3
 
-
+BuildRequires:  gcc-c++
 BuildRequires:  chmlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs4-devel
-BuildRequires:  perl
-BuildRequires:  openssl-devel
-BuildRequires:  phonon-devel
+BuildRequires:  qt4-devel
 BuildRequires:  libzip-devel
 BuildRequires:  qtwebkit-devel
 
@@ -24,18 +23,10 @@ Requires: %{name}-common = %{version}-%{release}
 %description
 KchmViewer is a chm (MS HTML help file format) viewer.
 
-This package contains the version for KDE4.
-
-%package qt
-Summary: Qt4-based CHM viewer
-Requires: %{name}-common = %{version}-%{release}
-%description qt
-KchmViewer is a chm (MS HTML help file format) viewer.
-
 This package contains the Qt-only version.
 
 %package common
-Summary: Common data files for KchmViewer.
+Summary: Common data files for KchmViewer
 BuildArch: noarch
 Requires: hicolor-icon-theme
 %description common
@@ -49,43 +40,17 @@ Common data files for KchmViewer.
 # make the Qt-only version
 %_qt4_qmake
 make
-mv bin/%{name}{,-qt}
-
-# make the KDE version
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} ..
-popd
-
-make %{?_smp_mflags} -C %{_target_platform}
-
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-# install the KDE version
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-
 # install the Qt-only version
-cp -p bin/%{name}-qt $RPM_BUILD_ROOT%{_bindir}
-pushd $RPM_BUILD_ROOT%{_datadir}/applications/
-cp -p kde4/%{name}.desktop %{name}-qt.desktop
-sed -i -e 's/^\(Exec=kchmviewer\) \(.*\)$/\1-qt \2/' \
-       -e 's/^\(Name.*\)$/\1 \(Qt-only\)/' \
-       -e 's/KDE;//' %{name}-qt.desktop
-popd
-
-install -Dpm 644 packages/%{name}.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor/128x128/apps/%{name}.png
-
-%find_lang kchmviewer --with-kde
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp -p bin/%{name} $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
+cp -p packages/%{name}.desktop $RPM_BUILD_ROOT%{_datadir}/applications/
+install -Dpm 644 packages/%{name}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kchmviewer.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/%{name}-qt.desktop
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %post
 update-desktop-database -q &> /dev/null ||:
@@ -93,41 +58,35 @@ update-desktop-database -q &> /dev/null ||:
 %postun
 update-desktop-database -q &> /dev/null ||:
 
-%post qt
-update-desktop-database -q &> /dev/null ||:
-
-%postun qt
-update-desktop-database -q &> /dev/null ||:
-
 %post common
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans common
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun common
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+   touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%files -f kchmviewer.lang
-%defattr(-,root,root,-)
-%{_kde4_bindir}/kchmviewer
-%{_kde4_datadir}/applications/kde4/*.desktop
-
-%files qt
-%defattr(-,root,root,-)
-%{_bindir}/%{name}-qt
-%{_datadir}/applications/%{name}-qt.desktop
+%files
+%{_bindir}/kchmviewer
+%{_datadir}/applications/%{name}.desktop
 
 %files common
-%defattr(-,root,root,-)
-%doc README COPYING ChangeLog FAQ
-%{_kde4_iconsdir}/hicolor/*/apps/kchmviewer.*
+%doc README ChangeLog FAQ
+%license COPYING
+%{_datadir}/icons/hicolor/*/apps/kchmviewer.*
 
 
 %changelog
+* Sun Oct 11 2015 Robin Lee <cheeselee@fedoraproject.org> - 7.3-1
+- Update to 7.3
+- Build only the qt version, since kde4 is obsolete in Fedora and kchmviewer
+  no longer uses KHTML
+- BR added: gcc-c++, qt4-devel; BR removed: perl, openssl-devel, phonon-devel
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 071dfb2..1684c9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdf99e82f0f95e29bf9e24b86292601c  kchmviewer-7.1.tar.gz
+d62647d897f9196ade034363e0d58c13  kchmviewer-7.3.tar.gz