SPECS: kdiff3.spec - up to 0.9.94 (kde4); broken

[arekm]

Author: arekm                        Date: Sat Feb 28 20:42:12 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.9.94 (kde4); broken

---- Files affected:
SPECS:
   kdiff3.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/kdiff3.spec
diff -u SPECS/kdiff3.spec:1.36 SPECS/kdiff3.spec:1.37
--- SPECS/kdiff3.spec:1.36	Sat Sep 22 01:16:06 2007
+++ SPECS/kdiff3.spec	Sat Feb 28 21:42:07 2009
@@ -2,23 +2,16 @@
 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.92
-Release:	1
+Version:	0.9.94
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/kdiff3/%{name}-%{version}.tar.gz
-# Source0-md5:	c7b52bfee6a085393de0c4f83732e8f0
-Patch0:		%{name}-desktop.patch
-Patch1:		kde-ac260.patch
-Patch2:		kde-am.patch
-Patch3:		kde-ac260-lt.patch
+# Source0-md5:	8bf580e53a420b1aa1eca3ea502bbe8b
 URL:		http://kdiff3.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	gettext-devel
-BuildRequires:	kdelibs-devel >= 9:3.2.0
+BuildRequires:	cmake
+BuildRequires:	kde4-kdebase-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
-BuildRequires:	sed >= 4.0
 Requires:	diffutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,31 +32,29 @@
 
 %prep
 %setup -q
-%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-%patch3 -p1
-
-%{__sed} -i -e 's,\$(TOPSUBDIRS),doc po src,' Makefile.am
 
 %build
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f Makefile.cvs
-
-%configure \
-	--with-qt-libraries=%{_libdir}
+install -d build
+cd build
+%cmake \
+        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
+%if "%{_lib}" == "lib64"
+        -DLIB_SUFFIX=64 \
+%endif
+        ../
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir} \
-	shelldesktopdir=%{_desktopdir}/kde
+%{__make} -C build install \
+        DESTDIR=$RPM_BUILD_ROOT \
+        kde_htmldir=%{_kdedocdir} \
+        kde_libs_htmldir=%{_kdedocdir}
 
-%find_lang %{name} --with-kde
+%find_lang %{name} --with-kde --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,8 +63,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
+%attr(755,root,root) %{_libdir}/kde4/*.so
 %{_datadir}/apps/kdiff3
 %{_datadir}/apps/kdiff3part
 %{_datadir}/services/kdiff3part.desktop
@@ -87,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2009/02/28 20:42:07  arekm
+- up to 0.9.94 (kde4); broken
+
 Revision 1.36  2007/09/21 23:16:06  wolf
 - 0.9.92
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdiff3.spec?r1=1.36&r2=1.37&f=u