[kdiff3] qt subpkg, Qt-only build (#746663)

[Rex Dieter]

commit 2a66ec252d53d188b83967ed63d8a910090f53f6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 17:56:57 2014 -0500

    qt subpkg, Qt-only build (#746663)

 kdiff3-0.9.95-docbook_fixes.patch  |   41 ------------------------------------
 kdiff3-0.9.98-install_prefix.patch |   31 +++++++++++++++++++++++++++
 kdiff3.spec                        |   35 +++++++++++++++++++++++++++++-
 kdiff3part.desktop.diff            |   10 --------
 kdiff3part.rc.diff                 |   11 ---------
 5 files changed, 65 insertions(+), 63 deletions(-)
---
diff --git a/kdiff3-0.9.98-install_prefix.patch b/kdiff3-0.9.98-install_prefix.patch
new file mode 100644
index 0000000..4f3cd53
--- /dev/null
+++ b/kdiff3-0.9.98-install_prefix.patch
@@ -0,0 +1,31 @@
+diff -up kdiff3-0.9.98/src-QT4/kdiff3.pro.install_prefix kdiff3-0.9.98/src-QT4/kdiff3.pro
+--- kdiff3-0.9.98/src-QT4/kdiff3.pro.install_prefix	2014-07-03 06:37:37.000000000 -0500
++++ kdiff3-0.9.98/src-QT4/kdiff3.pro	2014-09-16 17:53:47.745252576 -0500
+@@ -66,12 +66,12 @@ os2 {
+ }
+ 
+ unix {
+-  documentation.path = /usr/local/share/doc/kdiff3
++  documentation.path = /usr/share/doc/kdiff3
+   documentation.files = ../doc/*
+ 
+-  INSTALLS += documentation
++  #INSTALLS += documentation
+ 
+-  target.path = /usr/local/bin
++  target.path = /usr/bin
+   INSTALLS += target
+ }
+ 
+diff -up kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp.install_prefix kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp
+--- kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp.install_prefix	2014-07-03 06:37:37.000000000 -0500
++++ kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp	2014-09-16 17:53:43.910292281 -0500
+@@ -111,7 +111,7 @@ static void showHelp()
+          pBrowser = new QTextBrowser( 0 );
+          pBrowser->setMinimumSize( 600, 400 );
+       }
+-      pBrowser->setSource(QUrl("file://usr/local/share/doc/kdiff3/en/index.html"));
++      pBrowser->setSource(QUrl("file://usr/share/doc/kdiff3/en/index.html"));
+       pBrowser->show();
+    #endif
+ }
diff --git a/kdiff3.spec b/kdiff3.spec
index 0d28602..bf87956 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,12 +1,16 @@
 Name:           kdiff3
 Version:        0.9.98
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
 
+## upstreamable patches
+# use standard install prefix for Qt-only build, docs disabled (doesn't work, no index.html)
+Patch1: kdiff3-0.9.98-install_prefix.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -25,10 +29,22 @@ KDiff3 is a program that
 - has support for KDE-KIO (ftp, sftp, http, fish, smb)
 - and has an intuitive graphical user interface.
 
+%package qt
+Summary: Qt-only application to Compare + merge 2 or 3 files or directories
+%description qt
+kdiff3-qt is a Qt-only program that
+- compares and merges two or three input files or directories,
+- shows the differences line by line and character by character (!),
+- provides an automatic merge-facility and
+- an integrated editor for comfortable solving of merge-conflicts
+- and has an intuitive graphical user interface.
+
 
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch1 -p1 -b .install_prefix
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -37,8 +53,19 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+## Qt-only build
+mkdir -p %{_target_platform}-qt4
+pushd    %{_target_platform}-qt4
+%{_qt4_qmake} ../src-QT4
+popd
+make %{?_smp_mflags} -C %{_target_platform}-qt4
+
 
 %install
+make -C %{_target_platform}-qt4 install INSTALL_ROOT=$RPM_BUILD_ROOT
+# rename binary so it doesn't conflict with kde version
+mv $RPM_BUILD_ROOT%{_bindir}/kdiff3 $RPM_BUILD_ROOT%{_bindir}/kdiff3-qt
+
 make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
 # locale's
@@ -84,7 +111,13 @@ update-desktop-database -q &> /dev/null
 %{_kde4_datadir}/kde4/services/kdiff3*.desktop
 %{_mandir}/man1/kdiff3.1*
 
+%files qt
+%{_bindir}/kdiff3-qt
+
 %changelog
+* Tue Sep 16 2014 Rex Dieter <rdieter at fedoraproject.org> 0.9.98-4
+- -qt subpkg, Qt-only build (#746663)
+
 * Tue Sep 16 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.9.98-3
 - Provides: mergetool (#990447)
 - .spec cleanup