SPECS: kdiff3.spec - rel 2; more patches

arekm arekm at pld-linux.org
Thu Nov 30 10:35:38 CET 2006


Author: arekm                        Date: Thu Nov 30 09:35:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; more patches

---- Files affected:
SPECS:
   kdiff3.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/kdiff3.spec
diff -u SPECS/kdiff3.spec:1.30 SPECS/kdiff3.spec:1.31
--- SPECS/kdiff3.spec:1.30	Thu Nov  2 02:57:44 2006
+++ SPECS/kdiff3.spec	Thu Nov 30 10:35:32 2006
@@ -3,12 +3,15 @@
 Summary(pl):	kdiff3 - Graficzne narzędzie do łączenia zawartości wielu plików lub katalogów
 Name:		kdiff3
 Version:	0.9.91
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/kdiff3/%{name}-%{version}.tar.gz
 # Source0-md5:	e56613506475f23b8ab713f325dea6e3
 Patch0:		%{name}-desktop.patch
+Patch1:		kde-ac260.patch
+Patch2:		kde-am.patch
+Patch3:		kde-ac260-lt.patch
 URL:		http://kdiff3.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -19,6 +22,8 @@
 Requires:	diffutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define         _noautoreq      libtool(.*)
+
 %description
 KDiff3 is program able to compares two or three text input files,
 shows the differences line by line and character by character (!),
@@ -37,6 +42,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %{__sed} -i -e 's,\$(TOPSUBDIRS),doc po src,' Makefile.am
 
@@ -81,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2006/11/30 09:35:32  arekm
+- rel 2; more patches
+
 Revision 1.30  2006/11/02 01:57:44  shadzik
 - 0.9.91
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdiff3.spec?r1=1.30&r2=1.31&f=u



More information about the pld-cvs-commit mailing list