Hello community, here is the log from the commit of package smb4k for openSUSE:Factory checked in at Mon Mar 14 11:07:36 CET 2011.
-------- --- KDE/smb4k/smb4k.changes 2011-01-14 13:32:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/smb4k/smb4k.changes 2011-03-10 22:49:09.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Mar 10 21:14:57 UTC 2011 - [email protected] + +- Update to version 0.10.10: + * Fixed "Invalid command: net rap share list" error. + * Improved smb4k_sudowriter utility program. Version has been bumped to 0.4. +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Removed smb4k-devel subpackage and merged it in the main package since the + package doesn't actually provides any shared libraries. Also fixed rpmlint + warning "devel-file-in-non-devel-package". + * Removed smb4k-doc subpackage and merged it in the main package since it + contained the package's english main help files. + * Updates in Summary: and %description. + * Updates in Buildrequires:, Requires:. Added packages in Recommends: + section. + * Moved smb4k-lang package to Recommends: section (from Requires:). + * Updates in %install and %files sections. + * Minor other updates. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- smb4k-0.10.9.tar.bz2 New: ---- smb4k-0.10.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smb4k.spec ++++++ --- /var/tmp/diff_new_pack.o331CE/_old 2011-03-14 11:04:05.000000000 +0100 +++ /var/tmp/diff_new_pack.o331CE/_new 2011-03-14 11:04:05.000000000 +0100 @@ -19,42 +19,46 @@ Name: smb4k -Url: http://smb4k.berlios.de/ -Version: 0.10.9 +Version: 0.10.10 Release: 1 -Summary: Extended SMB and CIFS Share Browser for KDE +Summary: Advanced Network Neighborhood Browser for KDE + License: GPLv2+ +Url: http://smb4k.berlios.de/ Group: Productivity/Networking/Samba -BuildRequires: kdebase4-workspace-devel libkde4-devel -%if 0%{?suse_version} < 1010 -BuildRequires: update-desktop-files -%endif -%if 0%{?suse_version} > 1020 +Source0: http://prdownload.berlios.de/smb4k/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: fdupes +BuildRequires: gettext +BuildRequires: libkde4-devel +%if 0%{?suse_version} +BuildRequires: update-desktop-files %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: %{name}-%{version}.tar.bz2 -Requires: kdebase4-runtime -Requires: %{name}-lang = %version -Recommends: %{name}-doc = %version -Provides: kde4-smb4k = 0.10.2 +Requires: cifs-utils +Requires: samba-client +%kde4_runtime_requires +Recommends: enscript +Recommends: rsync +Recommends: texlive +Recommends: %{name}-lang = %{version} +Provides: kde4-smb4k = %{version} Obsoletes: kde4-smb4k <= 0.10.2 +Obsoletes: smb4k-devel +Obsoletes: smb4k-doc %description -Smb4K is a more extensive share browser than the standard KDE network -browser (via smb:/ slave). It has a larger number of features and is -also designed as an administrator tool. - - - -Authors: --------- - Alexander Reinholdt <[email protected]> +Smb4K is an advanced network neighborhood browser for KDE and a frontend to the +programs of the Samba software suite. Its purpose is to provide a program +that's easy to use and has as many features as possible. %lang_package %prep -%setup -q -n %{name}-%{version} +%setup -q +# Fix po file name mv po/pt/pt.po po/pt/smb4k.po +# Fix permissions +chmod 644 AUTHORS BUGS COPYING FAQ README TODO %build %cmake_kde4 -d build @@ -62,81 +66,59 @@ %install cd build -%makeinstall -%suse_update_desktop_file -r %{name} System Network +%kde4_makeinstall cd .. -%find_lang %{name} --without-kde -%if 0%{?suse_version} > 1020 -%fdupes -s %buildroot -%endif - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%clean -rm -rf "$RPM_BUILD_ROOT" - -%files lang -f %{name}.lang - -%files -%defattr(-,root,root) -/usr/share/applications/kde4/smb4k.desktop -/usr/share/kde4/* -/usr/%_lib/kde4/libsmb4kconfigdialog.so -/usr/%_lib/kde4/libsmb4knetworkbrowser.so -/usr/%_lib/kde4/libsmb4ksearchdialog.so -/usr/%_lib/kde4/libsmb4ksharesview.so -/usr/%_lib/libsmb4kdialogs.so -/usr/%_lib/libsmb4kcore.so.* -/usr/bin/smb4k -/usr/bin/smb4k_mount -/usr/bin/smb4k_umount -/usr/bin/smb4k_kill -/usr/bin/smb4k_sudowriter -/usr/share/icons/* - -%package devel -License: GPLv2+ -Summary: Extended SMB and CIFS Share Browser for KDE -Requires: %name = %version -Requires: libkde4-devel -Group: Development/Libraries/C and C++ - -%description devel -Smb4K is a more extensive share browser than the standard KDE network -browser (via smb:/ slave). It has a larger number of features and is -also designed as an administrator tool. +# Not needed, fix "devel-file-in-non-devel-package" rpmlint warning +rm -f %{buildroot}%{_kde4_libdir}/libsmb4kcore.so +# +%if 0%{?suse_version} +%suse_update_desktop_file -r %{name} Qt KDE System Network +%endif -Authors: --------- - Alexander Reinholdt <[email protected]> +%fdupes -s %{buildroot} -%files devel -%defattr(-,root,root) -/usr/%_lib/libsmb4kcore.so +%find_lang %{name} -%package doc -License: GPLv2+ -Summary: Extended SMB and CIFS Share Browser for KDE -Requires: %name = %version -Group: Productivity/Networking/Samba +%kde_post_install -%description doc -Smb4K is a more extensive share browser than the standard KDE network -browser (via smb:/ slave). It has a larger number of features and is -also designed as an administrator tool. +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%clean +rm -rf %{buildroot} -Authors: --------- - Alexander Reinholdt <[email protected]> +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ README TODO +%{_kde4_bindir}/smb4k +%{_kde4_bindir}/smb4k_kill +%{_kde4_bindir}/smb4k_mount +%{_kde4_bindir}/smb4k_sudowriter +%{_kde4_bindir}/smb4k_umount +%{_kde4_modulesdir}/libsmb4kconfigdialog.so +%{_kde4_modulesdir}/libsmb4knetworkbrowser.so +%{_kde4_modulesdir}/libsmb4ksearchdialog.so +%{_kde4_modulesdir}/libsmb4ksharesview.so +%{_kde4_libdir}/libsmb4kcore.so* +%{_kde4_libdir}/libsmb4kdialogs.so +%{_kde4_applicationsdir}/smb4k.desktop +%doc %lang(en) %{_kde4_htmldir}/en/smb4k/ +%{_kde4_iconsdir}/hicolor/*/apps/smb4k.png +%{_kde4_iconsdir}/oxygen/*/apps/smb4k.png +%{_kde4_appsdir}/kconf_update/authentication1.sh +%{_kde4_appsdir}/kconf_update/network1.sh +%{_kde4_appsdir}/kconf_update/network2.sh +%{_kde4_appsdir}/kconf_update/samba1.sh +%{_kde4_appsdir}/kconf_update/smb4ksettings.upd +%{_kde4_appsdir}/kconf_update/userinterface1.sh +%{_kde4_appsdir}/smb4k/ +%{_kde4_sharedir}/config.kcfg/smb4k.kcfg -%files doc -%defattr(-,root,root) -%lang(en) /usr/share/doc/* +%files lang -f %{name}.lang +%defattr(-,root,root,-) +%exclude %{_kde4_htmldir}/en/smb4k/ %changelog ++++++ smb4k-0.10.9.tar.bz2 -> smb4k-0.10.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.9/CMakeLists.txt new/smb4k-0.10.10/CMakeLists.txt --- old/smb4k-0.10.9/CMakeLists.txt 2010-09-11 15:03:19.000000000 +0200 +++ new/smb4k-0.10.10/CMakeLists.txt 2011-03-08 13:05:27.000000000 +0100 @@ -1,9 +1,9 @@ project( smb4k ) -set( VERSION 0.10.9 ) +set( VERSION 0.10.10 ) set( VERSION_MAJOR 0 ) set( VERSION_MINOR 10 ) -set( VERSION_PATCH 9 ) +set( VERSION_PATCH 10 ) cmake_minimum_required( VERSION 2.6 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.9/ChangeLog new/smb4k-0.10.10/ChangeLog --- old/smb4k-0.10.9/ChangeLog 2010-09-11 15:03:19.000000000 +0200 +++ new/smb4k-0.10.10/ChangeLog 2011-03-08 13:05:27.000000000 +0100 @@ -1,3 +1,7 @@ +Smb4K 0.10.10: +- Fixed "Invalid command: net rap share list" error. +- Improved smb4k_sudowriter utility program. Version has been bumped to 0.4. + Smb4K 0.10.9: - Fixed restoring of wrong file permissions for sudoers file (closes #17481). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.9/core/smb4ksambaoptionshandler.cpp new/smb4k-0.10.10/core/smb4ksambaoptionshandler.cpp --- old/smb4k-0.10.9/core/smb4ksambaoptionshandler.cpp 2010-09-11 15:03:19.000000000 +0200 +++ new/smb4k-0.10.10/core/smb4ksambaoptionshandler.cpp 2011-03-08 13:05:27.000000000 +0100 @@ -1019,26 +1019,44 @@ switch ( host.protocol() ) { case Smb4KHost::RPC: + { + args.append( " "+protocol_hint+" share list -l" ); + break; + } case Smb4KHost::RAP: { // protocol_hint carries the correct protocol: - args.append( " "+protocol_hint ); - + args.append( " "+protocol_hint+" share -l" ); break; } default: { - if ( QString::compare( default_protocol, "ads", Qt::CaseInsensitive ) != 0 ) + if ( !default_protocol.isEmpty() ) { - args.append( " "+default_protocol /* can be empty */ ); + if ( QString::compare( default_protocol, "rpc", Qt::CaseInsensitive ) == 0 ) + { + args.append( " "+default_protocol+" share list -l" ); + } + else if ( QString::compare( default_protocol, "rap", Qt::CaseInsensitive ) == 0 ) + { + args.append( " "+default_protocol+" share -l" ); + } + else + { + // Automatic detection + args.append( " share list -l" ); + } } - + else + { + // Automatic detection + args.append( " share list -l" ); + } + break; } } - args.append( " share list -l" ); - break; } case LookupHost: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/smb4k-0.10.9/utilities/smb4k_sudowriter.cpp new/smb4k-0.10.10/utilities/smb4k_sudowriter.cpp --- old/smb4k-0.10.9/utilities/smb4k_sudowriter.cpp 2010-09-11 15:03:19.000000000 +0200 +++ new/smb4k-0.10.10/utilities/smb4k_sudowriter.cpp 2011-03-08 13:05:27.000000000 +0100 @@ -48,10 +48,11 @@ #include <errno.h> #include <pwd.h> #include <iostream> -#include <cstdlib> - +#include <stdlib.h> using namespace std; +#define VERSION "0.4" + static const char description[] = I18N_NOOP( "This program writes to the sudoers file." ); @@ -517,7 +518,7 @@ KAboutData aboutData( "smb4k_sudowriter", "smb4k", ki18n( "smb4k_sudowriter" ), - "0.3", + VERSION, ki18n( description ), KAboutData::License_GPL_V2, ki18n( authors ), @@ -543,29 +544,6 @@ QFile lock_file; QFile sudoers; - switch( createLockFile( &lock_file ) ) - { - case 1: - { - cerr << argv[0] << ": " << I18N_NOOP( "The lock file could not be created." ) << endl; - cerr << argv[0] << ": " << lock_file.errorString().toUtf8().data() << endl; - cerr << argv[0] << ": " << I18N_NOOP( "Aborting." ) << endl; - exit( EXIT_FAILURE ); - break; - } - case 2: - { - cerr << argv[0] << ": " << I18N_NOOP( "The sudoers file is currently being edited." ) << endl; - cerr << argv[0] << ": " << I18N_NOOP( "Aborting." ) << endl; - exit( EXIT_FAILURE ); - break; - } - default: - { - break; - } - } - // Get the command line arguments. KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -598,16 +576,36 @@ } } - // Throw an error if no argument was provided. + // Show usage if no argument was provided. if ( adduser.isEmpty() && removeuser.isEmpty() ) { - KCmdLineArgs::usageError( i18n( "No arguments given." ) ); - removeLockFile( &lock_file ); + KCmdLineArgs::usageError( i18n( "No valid arguments provided." ) ); exit( EXIT_FAILURE ); } else { - // Do nothing + switch( createLockFile( &lock_file ) ) + { + case 1: + { + cerr << argv[0] << ": " << I18N_NOOP( "The lock file could not be created." ) << endl; + cerr << argv[0] << ": " << lock_file.errorString().toUtf8().data() << endl; + cerr << argv[0] << ": " << I18N_NOOP( "Aborting." ) << endl; + exit( EXIT_FAILURE ); + break; + } + case 2: + { + cerr << argv[0] << ": " << I18N_NOOP( "The sudoers file is currently being edited." ) << endl; + cerr << argv[0] << ": " << I18N_NOOP( "Aborting." ) << endl; + exit( EXIT_FAILURE ); + break; + } + default: + { + break; + } + } } // Check that the given users are all valid. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
