[qalculate-kde] kqalculate_0.9.7.10+nmu1 (initial kde4 support)

[Rex Dieter]

commit ee0bddd234ea142947b72a11c8ea6f3b26a24bdb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jun 27 08:19:46 2014 -0500

    kqalculate_0.9.7.10+nmu1 (initial kde4 support)

 .gitignore                      |    3 +-
 qalculate-kde-0.9.7-gcc47.patch |   18 --------
 qalculate-kde.spec              |   91 +++++++++++++++-----------------------
 qalculate_kde-desktop.patch     |   10 ----
 sources                         |    2 +-
 5 files changed, 39 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cdd5d40..8b0420c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-qalculate-kde-0.9.7.tar.gz
+/qalculate-kde-0.9.7.tar.gz
+/kqalculate_0.9.7.10+nmu1.tar.gz
diff --git a/qalculate-kde.spec b/qalculate-kde.spec
index 4bf2634..e2aea30 100644
--- a/qalculate-kde.spec
+++ b/qalculate-kde.spec
@@ -1,17 +1,18 @@
+
 Summary:	A multi-purpose desktop calculator for GNU/Linux
 Name:		qalculate-kde
-Version:	0.9.7
-Release:	10%{?dist}
+Version:	0.9.7.10
+Release:	1.nmu1%{?dist}
+
 License:	GPLv2+
-Group:		Applications/Engineering
 URL:		http://qalculate.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		qalculate_kde-desktop.patch
-# fix FTBFS with g++ 4.7
-Patch1:		qalculate-kde-0.9.7-gcc47.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libqalculate-devel, kdelibs3-devel, gettext
-BuildRequires:	desktop-file-utils, pkgconfig
+Source0:	http://downloads.sourceforge.net/project/qalculate/qalculate-kde4/kqalculate_%{version}+nmu1.tar.gz
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+BuildRequires:  pkgconfig(libqalculate)
+
 Requires:	gnuplot
 
 %description
@@ -19,71 +20,51 @@ Qalculate! is a modern multi-purpose desktop calculator for GNU/Linux. It is
 small and simple to use but with much power and versatility underneath.
 Features include customizable functions, units, arbitrary precision, plotting.
 
-This package provides a QT/KDE graphical interface for Qalculate! 
+This package provides a KDE graphical interface for Qalculate!
+
 
 %prep
-%setup -q 
-%patch0 -p0 -b .desktop
-%patch1 -p1 -b .gcc47
+%setup -c
 
 %build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath
-make %{?_smp_mflags}
-										
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-
-desktop-file-install --delete-original \
-%if 0%{?fedora} && 0%{?fedora} < 19
-	--vendor fedora					\
-%endif
-	--dir %{buildroot}%{_datadir}/applications	\
-	--mode 0644					\
-	%{buildroot}%{_datadir}/applications/kde/qalculate_kde.desktop
-
-%find_lang qalculate_kde || touch qalculate_kde.lang
-HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d %{buildroot}$HTML_DIR ]; then
-	for lang_dir in %{buildroot}$HTML_DIR/* ; do
-		lang=$(basename $lang_dir)
-		echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> qalculate_kde.lang
-	done
-fi
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-rm -rf %{buildroot}/%{_bindir}/qalculate
+%find_lang qalculate_kde --with-kde --without-mo
 
-%clean
-rm -rf %{buildroot}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 %files -f qalculate_kde.lang
-%defattr(-, root, root,-)
 %doc AUTHORS ChangeLog COPYING
-%{_bindir}/qalculate-kde
-%if 0%{?fedora} && 0%{?fedora} < 19
-%{_datadir}/applications/fedora-qalculate_kde.desktop
-%else
-%{_datadir}/applications/qalculate_kde.desktop
-%endif
-%{_datadir}/apps/qalculate_kde/
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/actions/*
+%{_kde4_bindir}/kqalculate
+%{_kde4_datadir}/applications/kde4/qalculate_kde.desktop
+%{_kde4_appsdir}/kqalculate/
+%{_kde4_iconsdir}/hicolor/*/*/*
+
 
 %changelog
+* Fri Jun 27 2014 Rex Dieter <rdieter at fedoraproject.org> 0.9.7.10-1.nmu1
+- kqalculate_0.9.7.10+nmu1 (initial kde4 support)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 3db4fe7..0c272c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90104c97894f4775737349ad99428bcf  qalculate-kde-0.9.7.tar.gz
+a040133050a9a3abcfb1615eca0045d3  kqalculate_0.9.7.10+nmu1.tar.gz