diff --git a/kdiff3-0.9.92.tar.gz b/kdiff3-0.9.92.tar.gz deleted file mode 100644 index c59be40..0000000 --- a/kdiff3-0.9.92.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4 -size 2220173 diff --git a/kdiff3-0.9.94.tar.bz2 b/kdiff3-0.9.94.tar.bz2 new file mode 100644 index 0000000..12bb0f5 --- /dev/null +++ b/kdiff3-0.9.94.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa7f382b23921d2c764b81658f9072696fc574310b344d23d0bded801054501f +size 972967 diff --git a/kdiff3.changes b/kdiff3.changes index 719485e..6165ba2 100644 --- a/kdiff3.changes +++ b/kdiff3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 20 18:29:46 CET 2009 - dmueller@suse.de + +- update to 0.9.94: + * ported to KDE4 + * various smaller fixes + ------------------------------------------------------------------- Sat Feb 14 12:34:47 CET 2009 - coolo@suse.de diff --git a/kdiff3.diff b/kdiff3.diff deleted file mode 100644 index 8d49dd3..0000000 --- a/kdiff3.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/Makefile.am.orig 2004-09-04 11:30:08.194094673 +0200 -+++ doc/Makefile.am 2004-09-04 11:30:16.631353060 +0200 -@@ -1,6 +1,4 @@ - # the SUBDIRS is filled automatically by am_edit. If files are - # in this directory they are installed into the english dir - --KDE_LANG = en da de es et fr it nl pt sv --KDE_DOCS = kdiff3 - SUBDIRS = $(AUTODIRS) diff --git a/kdiff3.spec b/kdiff3.spec index b54dd86..1f0e148 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,5 +1,5 @@ # -# spec file for package kdiff3 (Version 0.9.92) +# spec file for package kdiff3 (Version 0.9.94) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: kdiff3 -BuildRequires: kdebase3-devel +BuildRequires: kdebase4-workspace-devel %if %suse_version < 1010 -BuildRequires: unsermake update-desktop-files +BuildRequires: update-desktop-files %endif %if %suse_version > 1020 BuildRequires: fdupes @@ -30,12 +30,10 @@ License: GPL v2 or later Url: http://kdiff3.sourceforge.net/ Group: Development/Tools/Version Control Summary: Feature-Rich Code Comparison Utility -Version: 0.9.92 -Release: 237 +Version: 0.9.94 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.gz -Patch0: %name.diff -Patch1: kdiff3plugin-po.diff +Source0: %{name}-%{version}.tar.bz2 %description KDiff3 is a program that: @@ -59,42 +57,40 @@ Authors: %prep %setup -q -%patch0 -p0 -%patch1 -. /etc/opt/kde3/common_options -update_admin %build -. /etc/opt/kde3/common_options -./configure $configkde -make + %cmake_kde4 -d build + %make_jobs %install -. /etc/opt/kde3/common_options -make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET -rm -rf $RPM_BUILD_ROOT/usr -rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/kdiff3/README -%suse_update_desktop_file %name Development RevisionControl -kde_post_install -%find_lang %name %name.lang -%find_lang kdiff3_plugin %name.lang -%if %suse_version > 1020 -%fdupes -s $RPM_BUILD_ROOT -%endif + pushd build + %makeinstall + 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 +rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/*/kdiff3/common -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root) -%doc COPYING -/opt/kde3/bin/* -/opt/kde3/%_lib/kde3/lib* -/opt/kde3/share/icons/* -/opt/kde3/share/appl*/*/*.desktop -/opt/kde3/share/apps/* -/opt/kde3/share/applnk/.hidden/kdiff3plugin.desktop -/opt/kde3/share/services/kdiff3part.desktop -/opt/kde3/share/services/kdiff3_plugin.desktop +%doc COPYING +/usr/bin/kdiff3 +%_kde4_modules/libkdiff3part.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/apps/kdiff3 +%_datadir/doc/kde/HTML/* %changelog +* Fri Feb 20 2009 dmueller@suse.de +- update to 0.9.94: + * ported to KDE4 + * various smaller fixes * Sat Feb 14 2009 coolo@suse.de - call kde_post_install * Mon Nov 17 2008 stbinner@suse.de diff --git a/kdiff3plugin-po.diff b/kdiff3plugin-po.diff deleted file mode 100644 index dea3488..0000000 --- a/kdiff3plugin-po.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- kdiff3plugin/Makefile.am 2008/11/17 08:56:49 1.1 -+++ kdiff3plugin/Makefile.am 2008/11/17 08:57:11 -@@ -18,3 +18,5 @@ - - messages: rc.cpp - $(XGETTEXT) *.cpp *.h -o $(podir)/kdiff3_plugin.pot -+ -+SUBDIRS = po