SPECS: krusader.spec - stable 2.0.0 merget from DEVEL

rotom rotom at pld-linux.org
Sun Apr 12 10:18:33 CEST 2009


Author: rotom                        Date: Sun Apr 12 08:18:33 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- stable 2.0.0 merget from DEVEL

---- Files affected:
SPECS:
   krusader.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/krusader.spec
diff -u SPECS/krusader.spec:1.55 SPECS/krusader.spec:1.56
--- SPECS/krusader.spec:1.55	Sun Mar 23 14:27:19 2008
+++ SPECS/krusader.spec	Sun Apr 12 10:18:27 2009
@@ -2,70 +2,86 @@
 #
 # Conditional build:
 %bcond_without	libkonq		# importing the right click menu of konqueror
-%bcond_without	libkjsembed	# with libkjsembed
+%bcond_with	libkjsembed	# with libkjsembed
 #
-Summary:	Krusader is a filemanager for KDE 3
-Summary(pl.UTF-8):	Krusader jest zarządcą plików dla KDE 3
+
+Summary:	Krusader is a filemanager for KDE
+Summary(pl.UTF-8):	Krusader jest zarządcą plików dla KDE
 Name:		krusader
-Version:	1.90.0
+Version:	2.0.0
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/krusader/%{name}-%{version}.tar.gz
-# Source0-md5:	0bcf8f4d03484dae0390ffafa953ac40
-Patch0:		kde-ac260-lt.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-mount.patch
+# Source0-md5:	f80f500a136d549739ad5d4bcab7fa5f
+Patch0:		%{name}-desktop.patch
 URL:		http://krusader.sourceforge.net/
+BuildRequires:	Qt3Support-devel
+BuildRequires:	QtDBus-devel
+BuildRequires:	QtSvg-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	automoc4
+BuildRequires:	cmake
 BuildRequires:	gettext-devel
-%{?with_libkonq:BuildRequires:	kdebase-devel}
-%{?with_libkjsembed:BuildRequires:	kdebindings-kjsembed-devel}
-BuildRequires:	kdelibs-devel >= 3.5.0-4
-# FIXME: version
-BuildRequires:	kdelibs-shared
-BuildRequires:	qt-devel >= 6:3.3
+%{?with_libkonq:BuildRequires:	kde4-kdebase-devel}
+%{?with_libkjsembed:BuildRequires:	kde4-kdebindings-kjsembed-devel}
+BuildRequires:	kde4-kdelibs-devel
+BuildRequires:	phonon-devel
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
+BuildRequires:	zlib-devel
+Suggests:	bzip2
+Suggests:	cfv
+Suggests:	coreutils
+Suggests:	dpkg
+Suggests:	gzip
+Suggests:	kdiff3
+Suggests:	kde4-kdesdk-kompare
+Suggests:	krename >= 3.9.1
+Suggests:	lha
+Suggests:	md5deep
+Suggests:	p7zip
+Suggests:	tar
+Suggests:	unace
+Suggests:	unarj
+Suggests:	unrar
+Suggests:	unzip
+Suggests:	zip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %undefine	with_ccache
 
 %description
-Krusader is a filemanager for KDE 3, patterned after old-school
-managers like midnight commander and norton commander. It features
-basically all your file-management needs, plus extensive archive
-handling, mounted filesystems support, FTP and much much more. It is
-(almost) completely customizable, very user friendly, fast and damn
-good looking :-). You should give it a try.
+Krusader is a filemanager for KDE, patterned after old-school managers
+like midnight commander and norton commander. It features basically
+all your file-management needs, plus extensive archive handling,
+mounted filesystems support, FTP and much much more. It is (almost)
+completely customizable, very user friendly, fast and damn good
+looking :-). You should give it a try.
 
 %description -l pl.UTF-8
-Krusader jest zarządcą plików dla KDE 3, wzorowanym na takich
-zarządcach "starej szkoły", jak Midnight Commander czy Norton
-Commander. Zaspokaja w zasadzie wszystkie podstawowe potrzeby w
-zarządzaniu plików, dodatkowo obsługuje archiwa, montowanie systemów
-plików, FTP i o wiele, wiele więcej. Jest (prawie) całkowicie
-ustawialny, bardzo przyjazny dla użytkownika, szybki i cholernie ładny
-:-). Powinieneś go wypróbować.
+Krusader jest zarządcą plików dla KDE, wzorowanym na takich zarządcach
+"starej szkoły", jak Midnight Commander czy Norton Commander.
+Zaspokaja w zasadzie wszystkie podstawowe potrzeby w zarządzaniu
+plików, dodatkowo obsługuje archiwa, montowanie systemów plików, FTP i
+o wiele, wiele więcej. Jest (prawie) całkowicie ustawialny, bardzo
+przyjazny dla użytkownika, szybki i cholernie ładny :-). Powinieneś go
+wypróbować.
 
 %prep
 %setup -q 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
 
 %build
-cp -f /usr/share/automake/config.sub admin
-export QTDIR=%{_prefix}
-export KDEDIR=%{_prefix}
-%{__make} -f admin/Makefile.common cvs
-%configure \
-	--with-kiotar \
-	%{!?with_libkonq:--without-konqueror} \
-	%{!?with_libkjsembed:--without-javascript} \
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-	--with-qt-libraries=%{_libdir}
+install -d build
+cd build
+%cmake \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	../
 
 %{__make}
 
@@ -73,38 +89,29 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/krusader.desktop \
-	$RPM_BUILD_ROOT%{_desktopdir}/krusader.desktop
-mv -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/krusader_root-mode.desktop \
-	$RPM_BUILD_ROOT%{_desktopdir}/krusader_root-mode.desktop
+%{__make} -C build/ install \
+        DESTDIR=$RPM_BUILD_ROOT \
+        kde_htmldir=%{_kdedocdir}
+
+
 %find_lang %{name} --with-kde
 
 # locolor icons are deprecated (see kde .spec-s)
 rm -f $RPM_BUILD_ROOT%{_iconsdir}/locolor/*/apps/*.png
 
-# confilicts with krusader
-rm $RPM_BUILD_ROOT%{_libdir}/kde3/kio_tar.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog FAQ README TODO doc/actions_tutorial.txt
+%doc AUTHORS ChangeLog FAQ README doc/actions_tutorial.txt
 %attr(755,root,root) %{_bindir}/krusader
-%attr(755,root,root) %{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
+%attr(755,root,root) %{_libdir}/kde4/*.so
 %{_datadir}/apps/krusader
-%{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/config/kio_isorc
-%{_datadir}/services/*.protocol
-%{_desktopdir}/krusader*.desktop
-%{_iconsdir}/crystalsvg/*/apps/*.png
-%{_mandir}/man1/krusader.1*
+%{_datadir}/kde4/services/*.protocol
+%{_desktopdir}/kde4/*.desktop
+%{_iconsdir}/hicolor/*/*/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -112,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2009/04/12 08:18:27  rotom
+- stable 2.0.0 merget from DEVEL
+
 Revision 1.55  2008/03/23 13:27:19  witekfl
 - added BR kdelibs-shared (dtd/kdex.dtd)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/krusader.spec?r1=1.55&r2=1.56&f=u



More information about the pld-cvs-commit mailing list