packages: kdiff3/kdiff3.spec, kdiff3/kdiff3-docbook_fixes.patch (REMOVED), =?UTF-8?Q?=20?=...

[gotar]

Author: gotar                        Date: Mon Jun 25 16:00:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 0.9.96

---- Files affected:
packages/kdiff3:
   kdiff3.spec (1.45 -> 1.46) , kdiff3-docbook_fixes.patch (1.1 -> NONE)  (REMOVED), kdiff3-part.rc.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kdiff3/kdiff3.spec
diff -u packages/kdiff3/kdiff3.spec:1.45 packages/kdiff3/kdiff3.spec:1.46
--- packages/kdiff3/kdiff3.spec:1.45	Fri Jan  7 12:11:11 2011
+++ packages/kdiff3/kdiff3.spec	Mon Jun 25 18:00:48 2012
@@ -5,14 +5,12 @@
 Summary:	kdiff3 - Graphical tool for merging two or three files or directories
 Summary(pl.UTF-8):	kdiff3 - Graficzne narzędzie do łączenia zawartości wielu plików lub katalogów
 Name:		kdiff3
-Version:	0.9.95
-Release:	2
+Version:	0.9.96
+Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/kdiff3/%{name}-%{version}.tar.gz
-# Source0-md5:	652a98bf79ba762a8a646d4a0fddb323
-Patch0:		%{name}-part.rc.patch
-Patch1:		%{name}-docbook_fixes.patch
+# Source0-md5:	46b96befddf3448a3cb673f018c6f6f9
 URL:		http://kdiff3.sourceforge.net/
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
@@ -47,8 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
@@ -67,12 +63,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C build install \
-        DESTDIR=$RPM_BUILD_ROOT \
-        kde_htmldir=%{_kdedocdir} \
-        kde_libs_htmldir=%{_kdedocdir}
+	DESTDIR=$RPM_BUILD_ROOT \
+	kde_htmldir=%{_kdedocdir} \
+	kde_libs_htmldir=%{_kdedocdir}
 
 # remove locolor icons
-rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
+%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/locolor
 
 %find_lang %{name} --with-kde --all-name
 
@@ -97,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2012/06/25 16:00:48  gotar
+- upgraded to 0.9.96
+
 Revision 1.45  2011/01/07 11:11:11  arvenil
 - install kdiff3_part.rc into correct location
 - docbook fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kdiff3/kdiff3.spec?r1=1.45&r2=1.46