rpms/smb4k/devel smb4k-0.6.8-mount.patch, 1.1, 1.2 smb4k.spec, 1.5, 1.6
Marcin Garski (mgarski)
fedora-extras-commits at redhat.com
Fri Feb 17 18:39:08 UTC 2006
Author: mgarski
Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198
Modified Files:
smb4k-0.6.8-mount.patch smb4k.spec
Log Message:
- Updated smb4k-0.6.8-mount.patch
smb4k-0.6.8-mount.patch:
Index: smb4k-0.6.8-mount.patch
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k-0.6.8-mount.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smb4k-0.6.8-mount.patch 17 Feb 2006 11:17:05 -0000 1.1
+++ smb4k-0.6.8-mount.patch 17 Feb 2006 18:39:07 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urN smb4k-0.6.7/ChangeLog smb4k-0.6.8rc/ChangeLog
+diff -urN smb4k-0.6.7/ChangeLog smb4k-0.6.8/ChangeLog
--- smb4k-0.6.7/ChangeLog 2006-02-05 14:27:06.000000000 +0100
-+++ smb4k-0.6.8rc/ChangeLog 2006-02-17 07:59:51.000000000 +0100
++++ smb4k-0.6.8/ChangeLog 2006-02-17 07:59:51.000000000 +0100
@@ -1,3 +1,16 @@
+Smb4K 0.6.8:
+- Fixed another bug in the bookmark menu widget. It will again be updated
@@ -18,44 +18,44 @@
Smb4K 0.6.7:
- Fixed a crash in Smb4KBookmarkMenuWidget::insertBookmarks(), that was
introduced by the "fix" in 0.6.6.
-diff -urN smb4k-0.6.7/configure smb4k-0.6.8rc/configure
+diff -urN smb4k-0.6.7/configure smb4k-0.6.8/configure
--- smb4k-0.6.7/configure 2006-02-05 14:28:24.000000000 +0100
-+++ smb4k-0.6.8rc/configure 2006-02-17 09:02:07.000000000 +0100
++++ smb4k-0.6.8/configure 2006-02-17 18:30:07.000000000 +0100
@@ -1953,7 +1953,7 @@
# Define the identity of the package.
PACKAGE=smb4k
- VERSION=0.6.7
-+ VERSION=0.6.8rc
++ VERSION=0.6.8
cat >>confdefs.h <<_ACEOF
-diff -urN smb4k-0.6.7/configure.in smb4k-0.6.8rc/configure.in
+diff -urN smb4k-0.6.7/configure.in smb4k-0.6.8/configure.in
--- smb4k-0.6.7/configure.in 2006-02-05 14:28:04.000000000 +0100
-+++ smb4k-0.6.8rc/configure.in 2006-02-17 09:01:50.000000000 +0100
++++ smb4k-0.6.8/configure.in 2006-02-17 18:29:51.000000000 +0100
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(smb4k, 0.6.7) dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(smb4k, 0.6.8rc) dnl searches for some needed programs
++AM_INIT_AUTOMAKE(smb4k, 0.6.8) dnl searches for some needed programs
KDE_SET_PREFIX
-diff -urN smb4k-0.6.7/configure.in.in smb4k-0.6.8rc/configure.in.in
+diff -urN smb4k-0.6.7/configure.in.in smb4k-0.6.8/configure.in.in
--- smb4k-0.6.7/configure.in.in 2006-02-05 13:52:33.000000000 +0100
-+++ smb4k-0.6.8rc/configure.in.in 2006-02-17 08:08:01.000000000 +0100
++++ smb4k-0.6.8/configure.in.in 2006-02-17 18:24:15.000000000 +0100
@@ -1,6 +1,6 @@
#MIN_CONFIG(3.2.0)
-AM_INIT_AUTOMAKE(smb4k,0.6.7)
-+AM_INIT_AUTOMAKE(smb4k,0.6.8rc)
++AM_INIT_AUTOMAKE(smb4k,0.6.8)
dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__
-diff -urN smb4k-0.6.7/smb4k/core/smb4kcore.cpp smb4k-0.6.8rc/smb4k/core/smb4kcore.cpp
+diff -urN smb4k-0.6.7/smb4k/core/smb4kcore.cpp smb4k-0.6.8/smb4k/core/smb4kcore.cpp
--- smb4k-0.6.7/smb4k/core/smb4kcore.cpp 2005-11-21 08:13:13.000000000 +0100
-+++ smb4k-0.6.8rc/smb4k/core/smb4kcore.cpp 2006-02-17 09:02:04.000000000 +0100
++++ smb4k-0.6.8/smb4k/core/smb4kcore.cpp 2006-02-17 18:23:37.000000000 +0100
@@ -235,7 +235,10 @@
fileList << "ls";
fileList << "nmblookup";
@@ -67,16 +67,7 @@
fileList << "smbmount";
fileList << "smbumount";
fileList << "mount";
-@@ -246,6 +249,8 @@
- fileList << "smb4k_mount";
- fileList << "smb4k_umount";
- fileList << "smb4k_kill";
-+ fileList << "smb4k_cat";
-+ fileList << "smb4k_mv";
- fileList << "smbspool";
-
- // optional programs
-@@ -254,10 +259,7 @@
+@@ -254,10 +257,7 @@
optional << "sudo";
optional << "dvips";
optional << "enscript";
@@ -88,7 +79,7 @@
fileList += optional;
-@@ -276,7 +278,9 @@
+@@ -276,7 +276,9 @@
continue;
}
else
@@ -98,7 +89,7 @@
}
}
-@@ -300,13 +304,6 @@
+@@ -300,13 +302,6 @@
optional.remove( QString::null );
@@ -112,7 +103,7 @@
if ( optional.count() != 0 )
{
config()->setGroup( "Mount Options" );
-@@ -335,6 +332,95 @@
+@@ -335,6 +330,95 @@
config()->writeEntry( "Force Unmount", false );
}
}
@@ -208,9 +199,9 @@
}
}
-diff -urN smb4k-0.6.7/smb4k/core/smb4kmounter.cpp smb4k-0.6.8rc/smb4k/core/smb4kmounter.cpp
+diff -urN smb4k-0.6.7/smb4k/core/smb4kmounter.cpp smb4k-0.6.8/smb4k/core/smb4kmounter.cpp
--- smb4k-0.6.7/smb4k/core/smb4kmounter.cpp 2006-01-07 08:38:54.000000000 +0100
-+++ smb4k-0.6.8rc/smb4k/core/smb4kmounter.cpp 2006-02-17 07:38:03.000000000 +0100
++++ smb4k-0.6.8/smb4k/core/smb4kmounter.cpp 2006-02-17 07:38:03.000000000 +0100
@@ -672,14 +672,7 @@
if ( !run_suid || suid_program.isEmpty() )
@@ -411,9 +402,9 @@
}
#ifndef __FreeBSD__
-diff -urN smb4k-0.6.7/smb4k/widgets/smb4kbookmarkmenuwidget.cpp smb4k-0.6.8rc/smb4k/widgets/smb4kbookmarkmenuwidget.cpp
+diff -urN smb4k-0.6.7/smb4k/widgets/smb4kbookmarkmenuwidget.cpp smb4k-0.6.8/smb4k/widgets/smb4kbookmarkmenuwidget.cpp
--- smb4k-0.6.7/smb4k/widgets/smb4kbookmarkmenuwidget.cpp 2006-02-05 13:25:51.000000000 +0100
-+++ smb4k-0.6.8rc/smb4k/widgets/smb4kbookmarkmenuwidget.cpp 2006-02-11 10:24:07.000000000 +0100
++++ smb4k-0.6.8/smb4k/widgets/smb4kbookmarkmenuwidget.cpp 2006-02-11 10:24:07.000000000 +0100
@@ -146,6 +146,9 @@
}
}
@@ -424,9 +415,9 @@
uint index = 0;
while ( index < list.count() )
-diff -urN smb4k-0.6.7/smb4k/widgets/smb4kbrowserwidget.cpp smb4k-0.6.8rc/smb4k/widgets/smb4kbrowserwidget.cpp
+diff -urN smb4k-0.6.7/smb4k/widgets/smb4kbrowserwidget.cpp smb4k-0.6.8/smb4k/widgets/smb4kbrowserwidget.cpp
--- smb4k-0.6.7/smb4k/widgets/smb4kbrowserwidget.cpp 2006-01-19 22:44:21.000000000 +0100
-+++ smb4k-0.6.8rc/smb4k/widgets/smb4kbrowserwidget.cpp 2006-02-11 10:27:50.000000000 +0100
++++ smb4k-0.6.8/smb4k/widgets/smb4kbrowserwidget.cpp 2006-02-11 10:27:50.000000000 +0100
@@ -402,6 +402,7 @@
if ( item && item->depth() == 2 )
{
@@ -435,9 +426,9 @@
if ( item->text( Type ).contains( "Printer" ) == 0 )
{
-diff -urN smb4k-0.6.7/smb4k/widgets/smb4ksharewidget.cpp smb4k-0.6.8rc/smb4k/widgets/smb4ksharewidget.cpp
+diff -urN smb4k-0.6.7/smb4k/widgets/smb4ksharewidget.cpp smb4k-0.6.8/smb4k/widgets/smb4ksharewidget.cpp
--- smb4k-0.6.7/smb4k/widgets/smb4ksharewidget.cpp 2005-11-26 13:35:50.000000000 +0100
-+++ smb4k-0.6.8rc/smb4k/widgets/smb4ksharewidget.cpp 2006-02-15 08:46:02.000000000 +0100
++++ smb4k-0.6.8/smb4k/widgets/smb4ksharewidget.cpp 2006-02-15 08:46:02.000000000 +0100
@@ -268,20 +268,29 @@
if ( !shares.isEmpty() )
@@ -473,22 +464,35 @@
}
// Now process the entries in the list:
-Pliki binarne smb4k-0.6.7/smb4k.kdevelop.pcs i smb4k-0.6.8rc/smb4k.kdevelop.pcs się różnią
-diff -urN smb4k-0.6.7/smb4k.kdevses smb4k-0.6.8rc/smb4k.kdevses
+diff -urN smb4k-0.6.7/smb4k.kdevelop smb4k-0.6.8/smb4k.kdevelop
+--- smb4k-0.6.7/smb4k.kdevelop 2006-02-05 08:40:31.000000000 +0100
++++ smb4k-0.6.8/smb4k.kdevelop 2006-02-17 09:09:54.000000000 +0100
+@@ -164,10 +164,10 @@
+ </kdevcppsupport>
+ <kdevfilecreate>
+ <filetypes>
+- <type icon="source_h" ext="h" create="template" name="C/C++ header" >
++ <type icon="source_h" ext="h" name="C/C++ header" create="template" >
+ <descr>A new empty header file for C or C++.</descr>
+ </type>
+- <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
++ <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
+ <descr>A new empty C++ file.</descr>
+ </type>
+ </filetypes>
+Pliki binarne smb4k-0.6.7/smb4k.kdevelop.pcs i smb4k-0.6.8/smb4k.kdevelop.pcs się różnią
+diff -urN smb4k-0.6.7/smb4k.kdevses smb4k-0.6.8/smb4k.kdevses
--- smb4k-0.6.7/smb4k.kdevses 2006-02-05 08:40:30.000000000 +0100
-+++ smb4k-0.6.8rc/smb4k.kdevses 2006-02-17 08:46:12.000000000 +0100
-@@ -1,9 +1,9 @@
++++ smb4k-0.6.8/smb4k.kdevses 2006-02-17 09:09:54.000000000 +0100
+@@ -1,7 +1,7 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="10" >
+ <DocsAndViews NumberOfDocuments="4" >
<Doc0 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_06/ChangeLog" >
-- <View0 Type="Source" />
-+ <View0 line="10" Type="Source" />
- </Doc0>
- <Doc1 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_06/smb4k/core/smb4kglobal.h" >
<View0 Type="Source" />
+ </Doc0>
@@ -11,27 +11,9 @@
<Doc2 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_06/smb4k/core/smb4kglobal.cpp" >
<View0 Type="Source" />
@@ -496,7 +500,7 @@
- <Doc3 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_06/smb4k/core/smb4kuser.cpp" >
- <View0 Type="Source" />
+ <Doc3 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_06/smb4k/core/smb4kcore.cpp" >
-+ <View0 line="380" Type="Source" />
++ <View0 line="306" Type="Source" />
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:///home/alex/Entwicklung/smb4k_06/smb4k/widgets/smb4kbrowserwidget.cpp" >
- <View0 Type="Source" />
@@ -519,9 +523,9 @@
</DocsAndViews>
<pluginList>
<kdevdebugger>
-diff -urN smb4k-0.6.7/utilities/smb4k_mount.cpp smb4k-0.6.8rc/utilities/smb4k_mount.cpp
+diff -urN smb4k-0.6.7/utilities/smb4k_mount.cpp smb4k-0.6.8/utilities/smb4k_mount.cpp
--- smb4k-0.6.7/utilities/smb4k_mount.cpp 2005-06-09 16:12:55.000000000 +0200
-+++ smb4k-0.6.8rc/utilities/smb4k_mount.cpp 2006-02-17 07:38:08.000000000 +0100
++++ smb4k-0.6.8/utilities/smb4k_mount.cpp 2006-02-17 07:38:08.000000000 +0100
@@ -34,7 +34,7 @@
void info()
{
@@ -788,9 +792,9 @@
+
return EXIT_SUCCESS;
}
-diff -urN smb4k-0.6.7/utilities/smb4k_umount.cpp smb4k-0.6.8rc/utilities/smb4k_umount.cpp
+diff -urN smb4k-0.6.7/utilities/smb4k_umount.cpp smb4k-0.6.8/utilities/smb4k_umount.cpp
--- smb4k-0.6.7/utilities/smb4k_umount.cpp 2005-10-20 07:38:13.000000000 +0200
-+++ smb4k-0.6.8rc/utilities/smb4k_umount.cpp 2006-02-17 07:38:08.000000000 +0100
++++ smb4k-0.6.8/utilities/smb4k_umount.cpp 2006-02-17 07:38:08.000000000 +0100
@@ -24,19 +24,18 @@
#include <cstring>
#include <cerrno>
Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb4k.spec 17 Feb 2006 11:17:05 -0000 1.5
+++ smb4k.spec 17 Feb 2006 18:39:07 -0000 1.6
@@ -1,6 +1,6 @@
Name: smb4k
Version: 0.6.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The SMB/CIFS Share Browser for KDE
Group: Applications/Internet
@@ -109,6 +109,9 @@
%{_libdir}/*.so
%changelog
+* Fri Feb 17 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.7-4
+- Updated smb4k-0.6.8-mount.patch
+
* Fri Feb 17 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.7-3
- Add support of mount.cifs/umount.cifs (bug #181638)
- Remove smb4k-0.6.5-buff.patch
More information about the scm-commits
mailing list