[kdiff3] 0.9.98-3

[Rex Dieter]

commit 7005f6263644df4e8ac00d72fbf2d28316aa31ba
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 17:03:50 2014 -0500

    0.9.98-3
    
    - Provides: mergetool (#990447)
    - .spec cleanup

 kdiff3.spec |   38 +++++++++-----------------------------
 1 files changed, 9 insertions(+), 29 deletions(-)
---
diff --git a/kdiff3.spec b/kdiff3.spec
index c6e884e..eaa76ef 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,26 +1,11 @@
 Name:           kdiff3
 Version:        0.9.98
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
-Group:          Development/Tools
 License:        GPLv2
 URL:            http://kdiff3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/kdiff3/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# No longer needed for 0.9.97
-# Remove bogus MimeType tag from kdiff3part.desktop
-# Patch0:         kdiff3part.desktop.diff
-# No longer needed for 0.9.96
-# Install kdiff3_part.rc into correct location
-# Patch1:        kdiff3part.rc.diff
-# No longer needed for 0.9.96
-# fix build against kde-4.5 (pre)releases
-# Patch2:        kdiff3-0.9.95-docbook_fixes.patch
-
-# No longer needed for 0.9.98
-# Patch0:         kdiff3-0.9.97-saving_files.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -28,6 +13,9 @@ BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase4-devel
 Requires:  oxygen-icon-theme
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=990447
+Provides: mergetool
+
 %description
 KDiff3 is a program that
 - compares and merges two or three input files or directories,
@@ -51,16 +39,10 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make -C %{_target_platform} install/fast DESTDIR=$RPM_BUILD_ROOT
 
 # locale's
-%find_lang %{name} --with-kde || touch %{name}.lang
-%find_lang %{name}plugin || touch %{name}plugin.lang
-%find_lang kdiff3fileitemactionplugin || touch kdiff3fileitemactionplugin.lang
-cat %{name}plugin.lang >> %{name}.lang
-cat kdiff3fileitemactionplugin.lang >> %{name}.lang
+%find_lang %{name} --with-kde --all-name || touch %{name}.lang
 
 # Desktop.
 desktop-file-install  --vendor="" \
@@ -69,10 +51,6 @@ desktop-file-install  --vendor="" \
         $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kdiff3.desktop
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
@@ -91,9 +69,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/locolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_kde4_bindir}/kdiff3
 %{_kde4_libdir}/kde4/kdiff3fileitemaction.so
@@ -105,6 +81,10 @@ update-desktop-database -q &> /dev/null
 %{_kde4_datadir}/kde4/services/kdiff3*.desktop
 
 %changelog
+* Tue Sep 16 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.9.98-3
+- Provides: mergetool (#990447)
+- .spec cleanup
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.98-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild