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

diff --git a/krusader.spec b/krusader.spec
index 95509d3..8eb012a 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,30 +1,30 @@
+%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:	0.1
+Version:	1.60
+Release:	0.%{_beta}.1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Source0:	http://dl.sourceforge.net/%{name}/%{fn}.tar.gz
-# Source0-md5:	a4f248257f7b30d995caa4dcb014d1ca
+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:	autoconf
 BuildRequires:	automake
-BuildRequires:	fam-devel
-BuildRequires:	kdelibs-devel >= 3.1.1
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	qt-devel >= 3.1.2
-BuildRequires:	xrender-devel
+BuildRequires:	kdelibs-devel >= 3.2
+BuildRequires:	pcre-devel
+BuildRequires:	qt-devel >= 3.2
+BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_htmldir	/usr/share/doc/kde/HTML
-
 %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
+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.
 
@@ -33,32 +33,40 @@ 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 -n %{name}-%{version}
+%setup -q -n %{name}-%{version}.0-%{_beta}
+%patch0 -p1
+%patch1 -p0
+#%%patch2 -p0
+%patch3 -p1
 
 %build
+cp -f /usr/share/automake/config.sub admin
 export QTDIR=%{_prefix}
 export KDEDIR=%{_prefix}
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
-
-%configure
+%configure \
+	--disable-rpath \
+	--disable-debug \
+	--with-qt-libraries=%{_libdir}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install -d $RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	kde_htmldir=%{_kdedocdir}
 
-mv $RPM_BUILD_ROOT%{_applnkdir}/Applications/krusader.desktop $RPM_BUILD_ROOT%{_applnkdir}/Utilities/krusader.desktop
+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
 
@@ -68,19 +76,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/krusader
-%dir %{_datadir}/apps/krusader
-%dir %{_datadir}/apps/krusader/icons
-%dir %{_datadir}/apps/krusader/icons/hicolor
-%dir %{_datadir}/apps/krusader/icons/hicolor/*
-%dir %{_datadir}/apps/krusader/icons/hicolor/*/actions
-%{_datadir}/apps/krusader/icons/hicolor/16x16/actions/*
-%{_datadir}/apps/krusader/icons/hicolor/22x22/actions/*
-%{_datadir}/apps/krusader/icons/hicolor/32x32/actions/*
-%{_datadir}/apps/krusader/konfig_small.jpg
-%{_datadir}/apps/krusader/about.png
-%{_datadir}/apps/krusader/krusaderui.rc
-%{_applnkdir}/Utilities/krusader.desktop
-%{_pixmapsdir}/hicolor/32x32/apps/krusader2.png
-%{_pixmapsdir}/hicolor/32x32/apps/krusader.png
-%{_pixmapsdir}/locolor/16x16/apps/krusader.png
-%{_datadir}/mimelnk/application/x-ace.desktop
+%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}/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*