rpms/smb4k/devel smb4k-0.6.5-buff.patch, NONE, 1.1 smb4k.spec, 1.1, 1.2

Marcin Garski (mgarski) fedora-extras-commits at redhat.com
Wed Feb 1 20:47:36 UTC 2006


Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12466

Modified Files:
	smb4k.spec 
Added Files:
	smb4k-0.6.5-buff.patch 
Log Message:
- Fix GCC warnings
- Don't own KDE directories


smb4k-0.6.5-buff.patch:

--- NEW FILE smb4k-0.6.5-buff.patch ---
diff -ur smb4k-0.6.5-orig/utilities/smb4k_umount.cpp smb4k-0.6.5/utilities/smb4k_umount.cpp
--- smb4k-0.6.5-orig/utilities/smb4k_umount.cpp	2005-10-20 07:38:13.000000000 +0200
+++ smb4k-0.6.5/utilities/smb4k_umount.cpp	2006-02-01 21:39:51.000000000 +0100
@@ -321,7 +321,7 @@
   bool suid_arg_exists = false;
   bool fs_arg_exists = false;
 
-  int pos;
+  int pos = 0;
 
   for ( int i = 1; i < argc; i++ )
   {
@@ -392,7 +392,7 @@
     }
     else
     {
-      char *t = (char *)malloc( 250*sizeof(char) );
+      char *t = (char *)malloc( 251*sizeof(char) );
 
       if ( !t )
       {


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smb4k.spec	30 Jan 2006 23:58:16 -0000	1.1
+++ smb4k.spec	1 Feb 2006 20:47:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		smb4k
 Version:	0.6.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
@@ -8,6 +8,7 @@
 URL:		http://smb4k.berlios.de/
 Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
 Patch0:		smb4k-0.6.5-desktop.patch
+Patch1:		smb4k-0.6.5-buff.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	kdelibs-devel kdebase-devel gettext
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -96,10 +98,10 @@
 %{_libdir}/kde3/konqsidebar_smb4k.so
 %{_libdir}/libsmb4k*.so.*
 %{_datadir}/applications/*smb4k.desktop
-%{_datadir}/apps/konqsidebartng/
+%{_datadir}/apps/konqsidebartng/add/smb4k*.desktop
 %{_datadir}/apps/smb4k/
 %{_datadir}/doc/HTML/en/smb4k/
-%{_datadir}/icons/crystalsvg/*
+%{_datadir}/icons/crystalsvg/*/apps/smb4k.png
 
 %files devel
 %defattr(-, root, root)
@@ -107,6 +109,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Feb 01 2006 Marcin Garski <mgarski at post.pl> 0.6.5-5
+- Fix GCC warnings
+- Don't own KDE directories
+
 * Wed Jan 18 2006 Marcin Garski <mgarski at post.pl> 0.6.5-4
 - Remove libxml2 from BR
 - Add workaround for broken libtool archive (made by Dawid Gajownik)




More information about the scm-commits mailing list