- merged from AC-branch

Changed files:
    smb4k.spec -> 1.24

diff --git a/smb4k.spec b/smb4k.spec
index 635826ddc206d7610418e1b174c7c18ac36d00fd..510780bf83f8e3ff9c700cfada609b23667c5a29 100644 (file)
--- a/smb4k.spec
+++ b/smb4k.spec
@@ -1,7 +1,7 @@
 #
 #Note: smb4k needs suid root on smbmnt and smbumount
 #
-Summary:       SMB Share Browser
+Summary:       SMB share browser
 Summary(pl):   Przegl±darka zasobów SMB
 Name:          smb4k
 Version:       0.6.9
@@ -12,6 +12,7 @@ Source0:      http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
 # Source0-md5: d11cb15febf8c55c04f5c96e14fced0b
 URL:           http://smb4k.berlios.de/
 Patch0:                %{name}-Makefile.patch
+Patch1:                %{name}-desktop.patch
 BuildRequires: automake
 BuildRequires: kdebase-devel >= 9:3.1.0
 BuildRequires: qt-devel >= 3.1.1
@@ -29,6 +30,7 @@ Przegl
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* admin
@@ -47,9 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__perl} -pi -e 's/ü/ü/' $RPM_BUILD_ROOT%{_desktopdir}/kde/%{name}.desktop
-mv -f $RPM_BUILD_ROOT%{_desktopdir}/kde/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
-echo 'Categories=Qt;KDE;Network;' >> $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+#%{__perl} -pi -e 's/ü/ü/' $RPM_BUILD_ROOT%{_desktopdir}/kde/%{name}.desktop
+#mv -f $RPM_BUILD_ROOT%{_desktopdir}/kde/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
+#echo 'Categories=Qt;KDE;Network;' >> $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 %find_lang %{name} --with-kde
 
@@ -75,4 +77,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/smb4k
 %{_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
 %{_iconsdir}/crystalsvg/*/apps/*.png
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/kde/%{name}.desktop