From f26578dd793f1b81a71abdc7a6603ddc76202cd4b5c88646f7645f77fc465e42 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Thu, 6 Oct 2011 14:36:35 +0000
Subject: [PATCH] Accepting request 86795 from KDE:Distro:Factory

forward to factory

OBS-URL: https://build.opensuse.org/request/show/86795
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=17
---
 kdiff3.changes |  7 +++++
 kdiff3.spec    | 71 ++++++++++++++++++--------------------------------
 2 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/kdiff3.changes b/kdiff3.changes
index a4883bc..3245606 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,10 @@
+------------------------------------------------------------------- 
+Sat Sep 17 21:04:19 UTC 2011 - toddrme2178@gmail.com
+
+- Removed checks for obsolete openSUSE versions (fix for RPMLINT warnings)
+- Added check for duplicate files (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Tue Aug 10 09:34:13 UTC 2010 - beineri@opensuse.org
 
diff --git a/kdiff3.spec b/kdiff3.spec
index f49871f..ed3f707 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -15,27 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
-
 Name:           kdiff3
-BuildRequires:  kdebase4-workspace-devel libkonq-devel
-%if %suse_version < 1010
-BuildRequires:  update-desktop-files
-%endif
-%if %suse_version > 1020
-BuildRequires:  fdupes
-%endif
-License:        GPLv2+
-Url:            http://kdiff3.sourceforge.net/
-Group:          Development/Tools/Version Control
-Summary:        Feature-Rich Code Comparison Utility
 Version:        0.9.95
 Release:        10
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+License:        GPLv2+
+Summary:        Feature-Rich Code Comparison Utility
+Url:            http://kdiff3.sourceforge.net/
+Group:          Development/Tools/Version Control
 Source0:        %{name}-%{version}.tar.bz2
+BuildRequires:  fdupes
+BuildRequires:  kdebase4-workspace-devel
+BuildRequires:  libkonq-devel
+Recommends:     %{name}-lang = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
-Requires:       %{name}-lang = %{version}
 
 %description
 KDiff3 is a program that:
@@ -51,12 +44,6 @@ KDiff3 is a program that:
 
 * Has an intuitive graphical user interface
 
-
-
-Authors:
---------
-    Joachim Eibl <joachim.eibl@gmx.de>
-
 %lang_package
 %prep
 %setup -q
@@ -67,34 +54,28 @@ Authors:
 
 %install
   pushd build
-  %makeinstall
+  %make_install
   popd
-%suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
-%kde_post_install
-%find_lang %{name} %{name}.lang
-%find_lang kdiff3plugin %{name}.lang
-%find_lang desktop_extragear-utils_kdiff3 %{name}.lang
-rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/*/kdiff3/common
+  %suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
+  %kde_post_install
+  %find_lang %{name} %{name}.lang
+  %find_lang kdiff3plugin %{name}.lang
+  %find_lang desktop_extragear-utils_kdiff3 %{name}.lang
+  rm %{buildroot}%{_kde4_htmldir}/*/kdiff3/common
+  %fdupes -s %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc COPYING
-%if %suse_version < 1120
-%dir /usr/share/locale/hne
-%dir /usr/share/locale/hne/LC_MESSAGES
-%endif
-/usr/bin/kdiff3
-%_kde4_modules/libkdiff3part.so
-%_kde4_modules/libkdiff3plugin.so
-%_datadir/applications/kde4/kdiff3.desktop
-%_datadir/icons/hicolor/*/apps/kdiff3.png
-%_datadir/icons/locolor/*/apps/kdiff3.png
-%_datadir/kde4/apps/kdiff3/kdiff3_shell.rc
-%_datadir/kde4/apps/kdiff3/kdiff3_part.rc
-%_datadir/kde4/services/kdiff3part.desktop
-%_datadir/kde4/services/kdiff3_plugin.desktop
-%_datadir/kde4/apps/kdiff3
+%{_kde4_applicationsdir}/kdiff3.desktop
+%{_kde4_appsdir}/kdiff3/
+%{_kde4_bindir}/kdiff3
+%{_kde4_iconsdir}/??color/*/apps/kdiff3.png
+%{_kde4_modulesdir}/libkdiff3part.so
+%{_kde4_modulesdir}/libkdiff3plugin.so
+%{_kde4_servicesdir}/kdiff3part.desktop
+%{_kde4_servicesdir}/kdiff3_plugin.desktop
 
-%files lang -f %name.lang
+%files lang -f %{name}.lang
 
 %changelog