This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
4bb3a8459a
commit
2598bc592f
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
|
|
||||||
size 2220173
|
|
||||||
3
kdiff3-0.9.94.tar.bz2
Normal file
3
kdiff3-0.9.94.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:aa7f382b23921d2c764b81658f9072696fc574310b344d23d0bded801054501f
|
||||||
|
size 972967
|
||||||
@ -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
|
Sat Feb 14 12:34:47 CET 2009 - coolo@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -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)
|
|
||||||
66
kdiff3.spec
66
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.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -19,9 +19,9 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: kdiff3
|
Name: kdiff3
|
||||||
BuildRequires: kdebase3-devel
|
BuildRequires: kdebase4-workspace-devel
|
||||||
%if %suse_version < 1010
|
%if %suse_version < 1010
|
||||||
BuildRequires: unsermake update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
%endif
|
%endif
|
||||||
%if %suse_version > 1020
|
%if %suse_version > 1020
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -30,12 +30,10 @@ License: GPL v2 or later
|
|||||||
Url: http://kdiff3.sourceforge.net/
|
Url: http://kdiff3.sourceforge.net/
|
||||||
Group: Development/Tools/Version Control
|
Group: Development/Tools/Version Control
|
||||||
Summary: Feature-Rich Code Comparison Utility
|
Summary: Feature-Rich Code Comparison Utility
|
||||||
Version: 0.9.92
|
Version: 0.9.94
|
||||||
Release: 237
|
Release: 1
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Patch0: %name.diff
|
|
||||||
Patch1: kdiff3plugin-po.diff
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
KDiff3 is a program that:
|
KDiff3 is a program that:
|
||||||
@ -59,42 +57,40 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0
|
|
||||||
%patch1
|
|
||||||
. /etc/opt/kde3/common_options
|
|
||||||
update_admin
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
. /etc/opt/kde3/common_options
|
%cmake_kde4 -d build
|
||||||
./configure $configkde
|
%make_jobs
|
||||||
make
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
. /etc/opt/kde3/common_options
|
pushd build
|
||||||
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
|
%makeinstall
|
||||||
rm -rf $RPM_BUILD_ROOT/usr
|
popd
|
||||||
rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/kdiff3/README
|
%suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
|
||||||
%suse_update_desktop_file %name Development RevisionControl
|
%kde_post_install
|
||||||
kde_post_install
|
%find_lang %{name} %{name}.lang
|
||||||
%find_lang %name %name.lang
|
%find_lang kdiff3plugin %{name}.lang
|
||||||
%find_lang kdiff3_plugin %name.lang
|
rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/*/kdiff3/common
|
||||||
%if %suse_version > 1020
|
|
||||||
%fdupes -s $RPM_BUILD_ROOT
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -f %name.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
/opt/kde3/bin/*
|
/usr/bin/kdiff3
|
||||||
/opt/kde3/%_lib/kde3/lib*
|
%_kde4_modules/libkdiff3part.so
|
||||||
/opt/kde3/share/icons/*
|
%_datadir/applications/kde4/kdiff3.desktop
|
||||||
/opt/kde3/share/appl*/*/*.desktop
|
%_datadir/icons/hicolor/*/apps/kdiff3.png
|
||||||
/opt/kde3/share/apps/*
|
%_datadir/icons/locolor/*/apps/kdiff3.png
|
||||||
/opt/kde3/share/applnk/.hidden/kdiff3plugin.desktop
|
%_datadir/kde4/apps/kdiff3/kdiff3_shell.rc
|
||||||
/opt/kde3/share/services/kdiff3part.desktop
|
%_datadir/kde4/apps/kdiff3/kdiff3_part.rc
|
||||||
/opt/kde3/share/services/kdiff3_plugin.desktop
|
%_datadir/kde4/services/kdiff3part.desktop
|
||||||
|
%_datadir/kde4/apps/kdiff3
|
||||||
|
%_datadir/doc/kde/HTML/*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sat Feb 14 2009 coolo@suse.de
|
||||||
- call kde_post_install
|
- call kde_post_install
|
||||||
* Mon Nov 17 2008 stbinner@suse.de
|
* Mon Nov 17 2008 stbinner@suse.de
|
||||||
|
|||||||
@ -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
|
|
||||||
Loading…
Reference in New Issue
Block a user