SPECS: smb4k.spec - merged from AC-branch

[ankry]

Author: ankry                        Date: Mon Apr 17 08:44:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from AC-branch

---- Files affected:
SPECS:
   smb4k.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/smb4k.spec
diff -u SPECS/smb4k.spec:1.23 SPECS/smb4k.spec:1.24
--- SPECS/smb4k.spec:1.23	Fri Mar 24 22:38:18 2006
+++ SPECS/smb4k.spec	Mon Apr 17 10:44:14 2006
@@ -2,7 +2,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
@@ -13,6 +13,7 @@
 # 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
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* admin
@@ -48,9 +50,9 @@
 
 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
 
@@ -76,7 +78,7 @@
 %{_datadir}/apps/smb4k
 %{_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
 %{_iconsdir}/crystalsvg/*/apps/*.png
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/kde/%{name}.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/04/17 08:44:14  ankry
+- merged from AC-branch
+
 Revision 1.23  2006/03/24 21:38:18  rotom
 - up to 0.6.9
 - rm unnided smb4k-startup.patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/smb4k.spec?r1=1.23&r2=1.24&f=u