X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=krusader.spec;h=8eb012aba7d3b90df5208458eb19c5ea4fd4b688;hb=05ce895d2c5160c9ce7ca7e35b4967ecd560a01c;hp=cbc9bd91a1fdf1f0a608f652eb44ac0994eb3396;hpb=9f013c41f702ba513c3ce73fffd469641db4315b;p=packages%2Fkrusader.git

diff --git a/krusader.spec b/krusader.spec
index cbc9bd9..8eb012a 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,20 +1,22 @@
+%define		_beta	beta1
 Summary:	Krusader is a filemanager for KDE 3
 Summary(pl):	Krusader jest zarz±dc± plików dla KDE 3
 Name:		krusader
-Version:	1.30
-Release:	4
+Version:	1.60
+Release:	0.%{_beta}.1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/krusader/%{name}-%{version}.tar.gz
-# Source0-md5:	a4f248257f7b30d995caa4dcb014d1ca
-Patch0:		%{name}-doc.patch
-Patch1:		%{name}-gcc34.patch
-Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-bogus_locale.patch
+Source0:	http://dl.sourceforge.net/krusader/%{name}-%{version}.0-%{_beta}.tar.gz
+# Source0-md5:	808deb5e68ed11eeee6589cda0162f83
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-mount.patch
+Patch2:		%{name}-gcc34.patch
+Patch3:		%{name}-no_konqueror_libs.patch
 URL:		http://krusader.sourceforge.net/
-BuildRequires:	kdelibs-devel >= 3.1.1
+BuildRequires:	automake
+BuildRequires:	kdelibs-devel >= 3.2
 BuildRequires:	pcre-devel
-BuildRequires:	qt-devel >= 3.1.2
+BuildRequires:	qt-devel >= 3.2
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -22,7 +24,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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
+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.
 
@@ -31,26 +33,25 @@ Krusader jest zarz
 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
+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
+%setup -q -n %{name}-%{version}.0-%{_beta}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch1 -p0
+#%%patch2 -p0
 %patch3 -p1
 
-rm -f po/jp.*
-mv -f po/{dk,da}.po
-
 %build
 cp -f /usr/share/automake/config.sub admin
 export QTDIR=%{_prefix}
 export KDEDIR=%{_prefix}
-kde_htmldir="%{_kdedocdir}"; export kde_htmldir
-%configure
+%configure \
+	--disable-rpath \
+	--disable-debug \
+	--with-qt-libraries=%{_libdir}
 
 %{__make}
 
@@ -59,10 +60,13 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	kde_htmldir=%{_kdedocdir}
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/krusader.desktop \
 	$RPM_BUILD_ROOT%{_desktopdir}/krusader.desktop
+mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/Applications/krusader_root-mode.desktop \
+	$RPM_BUILD_ROOT%{_desktopdir}/krusader_root-mode.desktop
 
 %find_lang %{name} --with-kde
 
@@ -73,11 +77,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/krusader
 %attr(755,root,root) %{_libdir}/kde3/kio_krarc.so
+%attr(755,root,root) %{_libdir}/kde3/kio_iso.so
 %{_libdir}/kde3/kio_krarc.la
+%{_libdir}/kde3/kio_iso.la
 %{_datadir}/apps/krusader
 %{_datadir}/services/krarc.protocol
-#%%{_datadir}/mimelnk/application/x-ace.desktop # Exists in kdelibs
-%{_desktopdir}/krusader.desktop
-%{_iconsdir}/hicolor/32x32/apps/krusader2.png
-%{_iconsdir}/hicolor/32x32/apps/krusader.png
+%{_datadir}/services/iso.protocol
+%{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
+%{_datadir}/config/kio_isorc
+%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/krusader_red.png
+%{_iconsdir}/hicolor/*/apps/krusader.png
 %{_mandir}/man1/krusader.1*