From 9c70b591089ce0f77048f789eb303924811a328b9a84858746a274058dc37de1 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 10 Aug 2010 10:50:05 +0000 Subject: [PATCH] Accepting request 45277 from KDE:Distro:Factory Copy from KDE:Distro:Factory/kdiff3 based on submit request 45277 from user Beineri OBS-URL: https://build.opensuse.org/request/show/45277 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=15 --- kdiff3-0.9.95.tar.bz2 | 4 ++-- kdiff3.changes | 5 +++++ kdiff3.spec | 11 +++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/kdiff3-0.9.95.tar.bz2 b/kdiff3-0.9.95.tar.bz2 index 55c4ffc..a6c9ef7 100644 --- a/kdiff3-0.9.95.tar.bz2 +++ b/kdiff3-0.9.95.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:210a0fb316afd8495f2a428094f02df8d3b2fabdd61cb2e956f75d3f90e566df -size 977911 +oid sha256:9560a441915e54236291650006783a2e02be51635afdbef010deafd71798a057 +size 818151 diff --git a/kdiff3.changes b/kdiff3.changes index f915e03..a4883bc 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 10 09:34:13 UTC 2010 - beineri@opensuse.org + +- updated tarball to fix build + ------------------------------------------------------------------- Mon Mar 8 10:10:17 UTC 2010 - coolo@novell.com diff --git a/kdiff3.spec b/kdiff3.spec index 9593ea1..f49871f 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -19,7 +19,7 @@ Name: kdiff3 -BuildRequires: kdebase4-workspace-devel +BuildRequires: kdebase4-workspace-devel libkonq-devel %if %suse_version < 1010 BuildRequires: update-desktop-files %endif @@ -31,7 +31,7 @@ Url: http://kdiff3.sourceforge.net/ Group: Development/Tools/Version Control Summary: Feature-Rich Code Comparison Utility Version: 0.9.95 -Release: 3 +Release: 10 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 %kde4_runtime_requires @@ -73,19 +73,26 @@ Authors: %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 %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 %files lang -f %name.lang