- added desktop patch, switched to vfolders, files fixes, release 3

Changed files:
    krusader.spec -> 1.16

diff --git a/krusader.spec b/krusader.spec
index 1a9e145dd11b0a47613435f192b2b607fabde688..8b68206db82a0c7b42b6db6b8b4f48a0ed211699 100644 (file)
--- a/krusader.spec
+++ b/krusader.spec
@@ -2,13 +2,14 @@ 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:       2
+Release:       3
 License:       GPL
 Group:         X11/Applications
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+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
 URL:           http://krusader.sourceforge.net/
 BuildRequires: kdelibs-devel >= 3.1.1
 BuildRequires: pcre-devel
@@ -35,32 +36,29 @@ ustawialny, bardzo przyjazny dla u
 ³adny :-). Powiniene¶ go wypróbowaæ.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-cp /usr/share/automake/config.sub admin/
-
+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
-
+kde_htmldir="%{_kde_docdir}"; export kde_htmldir
 %configure
 
 %{__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
 
-mv -f $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
 
 %find_lang %{name} --with-kde
 
@@ -75,8 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/krusader
 %{_datadir}/services/krarc.protocol
 #%%{_datadir}/mimelnk/application/x-ace.desktop # Exists in kdelibs
-%{_applnkdir}/Utilities/krusader.desktop
-%{_pixmapsdir}/hicolor/32x32/apps/krusader2.png
-%{_pixmapsdir}/hicolor/32x32/apps/krusader.png
-%{_pixmapsdir}/locolor/16x16/apps/krusader.png
+%{_desktopdir}/krusader.desktop
+%{_iconsdir}/hicolor/32x32/apps/krusader2.png
+%{_iconsdir}/hicolor/32x32/apps/krusader.png
 %{_mandir}/man1/krusader.1*