Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit kdenetwork4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 11 Jan 2008 12:00:36 +0100
  • Message-id: <20080111110037.05BEB6781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdenetwork4
checked in at Fri Jan 11 12:00:36 CET 2008.

--------
--- KDE/kdenetwork4/kdenetwork4.changes 2008-01-03 16:35:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes
2008-01-05 19:46:31.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Jan 5 19:44:45 CET 2008 - stbinner@xxxxxxx
+
+- update to 4.0 release
+
+-------------------------------------------------------------------

Old:
----
desktop-files.diff
kdenetwork-3.97.2.tar.bz2

New:
----
4_0_BRANCH.diff
kdenetwork-4.0.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdenetwork4.spec ++++++
--- /var/tmp/diff_new_pack.f12419/_old 2008-01-11 12:00:10.000000000 +0100
+++ /var/tmp/diff_new_pack.f12419/_new 2008-01-11 12:00:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdenetwork4 (Version 3.97.2)
+# spec file for package kdenetwork4 (Version 4.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,17 @@
Name: kdenetwork4
BuildRequires: LibVNCServer-devel gpgme-devel kdebase4-workspace-devel
libqimageblitz-devel
BuildRequires: libqca2-devel meanwhile-devel openslp-devel sqlite-devel
wireless-tools
+BuildRequires: oxygen-icon-theme
License: GPL v2 or later
Group: Productivity/Networking/Other
Summary: KDE Network Base Package
Url: http://www.kde.org
-Version: 3.97.2
+Version: 4.0
Release: 1
-%define rversion 3.97.2
+%define rversion 4.0.0
Source0: kdenetwork-%rversion.tar.bz2
Source1: _upstream
-Patch2: desktop-files.diff
+Patch: 4_0_BRANCH.diff
Patch4: FIXME.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@@ -34,8 +35,9 @@
Suggests: kde4-krdc
Suggests: kde4-krfb
Suggests: kde4-knewsticker
-Suggests: kde4-lisa
+%if %suse_version > 1020
Suggests: kde4-kdnssd
+%endif
Suggests: kdenetwork4-filesharing
Provides: kdenetwork4-devel = 3.95.1
Obsoletes: kdenetwork4-devel <= 3.95.1
@@ -52,7 +54,7 @@

%prep
%setup -q -n kdenetwork-%rversion
-%patch2
+%patch
#%patch4

%build
@@ -62,16 +64,37 @@
%install
cd build
%makeinstall
+ cp /usr/share/icons/oxygen/128x128/apps/krdc.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
+ cp /usr/share/icons/oxygen/16x16/apps/krdc.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
+ cp /usr/share/icons/oxygen/22x22/apps/krdc.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/
+ cp /usr/share/icons/oxygen/32x32/apps/krdc.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
+ cp /usr/share/icons/oxygen/48x48/apps/krdc.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
+ cp /usr/share/icons/oxygen/64x64/apps/krdc.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
+ cp /usr/share/icons/oxygen/128x128/apps/krfb.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
+ cp /usr/share/icons/oxygen/16x16/apps/krfb.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
+ cp /usr/share/icons/oxygen/22x22/apps/krfb.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/
+ cp /usr/share/icons/oxygen/32x32/apps/krfb.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
+ cp /usr/share/icons/oxygen/48x48/apps/krfb.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
+ cp /usr/share/icons/oxygen/64x64/apps/krfb.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/apps/kget.svgz
$RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/128x128/apps/kget.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/16x16/apps/kget.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/22x22/apps/kget.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/32x32/apps/kget.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/48x48/apps/kget.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
+ mv $RPM_BUILD_ROOT/usr/share/icons/oxygen/64x64/apps/kget.png
$RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
%create_subdir_filelist -d filesharing
+%if %suse_version > 1020
%create_subdir_filelist -d kdnssd
+%endif
%create_subdir_filelist -d kget
%create_subdir_filelist -d knewsticker
%create_subdir_filelist -d kopete -v kopete.devel
%create_subdir_filelist -d kppp
%create_subdir_filelist -d krdc
%create_subdir_filelist -d krfb
- %create_subdir_filelist -d lanbrowsing
cd ..
+ sed -ri s,.*/usr/share/icons/oxygen/.*/apps/kget.*,, filelists/kget
%create_exclude_filelist
# FIXME: contact security team
chmod u-s $RPM_BUILD_ROOT/usr/bin/kppp
@@ -203,6 +226,7 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
%dir /usr/share/kde4/apps/zeroconf
+/usr/share/icons/hicolor/*/apps/krdc.*

%package -n kde4-krfb
Group: Productivity/Networking/Remote Desktop
@@ -227,6 +251,7 @@
%files -n kde4-krfb -f filelists/krfb
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
+/usr/share/icons/hicolor/*/apps/krfb.*

%package -n kde4-knewsticker
Group: Productivity/Networking/News/Clients
@@ -251,34 +276,7 @@
%files -n kde4-knewsticker -f filelists/knewsticker
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-
-%package -n kde4-lisa
-Group: Productivity/Networking/Other
-Summary: Lan Information Server LISa
-%kde4_runtime_requires
-
-%description -n kde4-lisa
-LISa is intended to provide a kind of "network neighbourhood" but only
-relying on the TCP/IP protocol stack, no smb or whatever.
-
-
-
-Authors:
---------
- The KDE Team <kde@xxxxxxx>
-
-%post -n kde4-lisa
-%run_ldconfig
-
-%postun -n kde4-lisa
-%run_ldconfig
-
-%files -n kde4-lisa -f filelists/lanbrowsing
-%defattr(-,root,root)
-%doc COPYING COPYING-DOCS README
-%lang (en) /usr/share/doc/kde/HTML/en/lisa
-%lang (en) /usr/share/doc/kde/HTML/en/kcontrol/lanbrowser
-%dir /usr/share/kde4/apps/lisa
+%if %suse_version > 1020

%package -n kde4-kdnssd
Group: Productivity/Networking/System
@@ -304,6 +302,7 @@
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
%dir /usr/share/kde4/apps/zeroconf
+%endif

%package filesharing
Group: Productivity/Networking/System
@@ -355,12 +354,15 @@
%files -n kde4-kget -f filelists/kget
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
+/usr/share/icons/hicolor/*/apps/kget.*

%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README

%changelog
+* Sat Jan 05 2008 - stbinner@xxxxxxx
+- update to 4.0 release
* Wed Jan 02 2008 - stbinner@xxxxxxx
- update to 3.97.2
* Sun Dec 16 2007 - dmueller@xxxxxxx

++++++ 4_0_BRANCH.diff ++++++
package: kdenetwork-4.0.0.tar.bz2
kdemod: kdenetwork
current HEAD: 759044
svn di between /tags/KDE/4.0.0 and /branches/KDE//branches/KDE/4.0
--- kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp
(revision 759054)
+++ kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp
(revision 759054)
@@ -114,7 +114,7 @@
return "image/jpeg";

qWarning("WARNING! VCard::image2type: unknown format = %s",
format.isNull() ? "UNKNOWN" :
- format.toAscii());
+ qPrintable(format));

return "image/unknown";
}
--- kopete/libkopete/kopetepassword.cpp (revision 759054)
+++ kopete/libkopete/kopetepassword.cpp (revision 759054)
@@ -137,10 +137,10 @@
return pwd;
}

- if ( mWallet && mWallet->readPassword(
mPassword.d->configGroup, pwd ) == 0 && !pwd.isNull() )
+ if ( mWallet && mWallet->readPassword(
mPassword.d->configGroup, pwd ) == 0 && !pwd.isEmpty() )
return pwd;

- if ( mPassword.d->remembered &&
!mPassword.d->passwordFromKConfig.isNull() )
+ if ( mPassword.d->remembered &&
!mPassword.d->passwordFromKConfig.isEmpty() )
return mPassword.d->passwordFromKConfig;

return QString();
--- kget/transfer-plugins/kio/transferKio.cpp (revision 759054)
+++ kget/transfer-plugins/kio/transferKio.cpp (revision 759054)
@@ -150,7 +150,7 @@

kDebug(5001) << "slotTotalSize";

- setStatus(Job::Running, i18n("Downloading.."),
SmallIcon("media-playback-start"));
+ setStatus(Job::Running, i18n("Downloading..."),
SmallIcon("media-playback-start"));

m_totalSize = size;
setTransferChange(Tc_Status | Tc_TotalSize, true);
--- filesharing/advanced/kcm_sambaconf/sambafile.cpp (revision
759054)
+++ filesharing/advanced/kcm_sambaconf/sambafile.cpp (revision
759054)
@@ -34,7 +34,7 @@
#include <klocale.h>
#include <ktemporaryfile.h>
#include <ksambashare.h>
-
+#include <KStandardDirs>
#include <pwd.h>
#include <time.h>
#include <unistd.h>
@@ -180,7 +180,7 @@
.arg(KShell::quoteArg(_tempFile->fileName()),
KShell::quoteArg(path),
KShell::quoteArg(_tempFile->fileName()));
- proc << "kdesu" << "-d" << suCommand;
+ proc << KStandardDirs::findExe("kdesu") << "-d" << suCommand;

if (proc.execute()) {
kDebug(5009) << "SambaFile::slotApply: saving to " << path << "
failed!";
--- filesharing/advanced/nfs/nfsfile.cpp (revision 759054)
+++ filesharing/advanced/nfs/nfsfile.cpp (revision 759054)
@@ -25,7 +25,7 @@
#include <qfile.h>
#include <qtextstream.h>
#include <qstringlist.h>
-
+#include <KStandardDirs>
#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
@@ -246,7 +246,7 @@

KProcess proc;
if (!QFileInfo(_url.path()).isWritable() || restartNFSServer)
- proc<<"kdesu" << "-d" << "-c"<<command;
+ proc<<KStandardDirs::findExe("kdesu") << "-d" << "-c"<<command;
else
proc.setShellCommand(command);

--- filesharing/advanced/propsdlgplugin/propertiespage.cpp
(revision 759054)
+++ filesharing/advanced/propsdlgplugin/propertiespage.cpp
(revision 759054)
@@ -37,6 +37,7 @@
#include <kprocess.h>
#include <ktemporaryfile.h>
#include <kshell.h>
+#include <KStandardDirs>
// NFS related
#include "../nfs/nfsfile.h"
#include "../nfs/nfsentry.h"
@@ -221,7 +222,7 @@
KShell::quoteArg( sambaFileName ));
}

- proc<<"kdesu" << "-d" << "-c"<<command;
+ proc<<KStandardDirs::findExe("kdesu") << "-d" << "-c"<<command;

if (proc.execute()) {
kDebug(FILESHARE_DEBUG) << "PropertiesPage::save: kdesu command failed";
--- kppp/pppdata.cpp (revision 759054)
+++ kppp/pppdata.cpp (revision 759054)
@@ -409,7 +409,6 @@
return true;
}

-
bool PPPData::deleteModem() {
if(cmodem < 0)
return false;
@@ -441,13 +440,16 @@
// make sure the top modem is cleared
setModemByIndex(modemhighcount);
map = config->entryMap(cmodemgroup);
- it = map.begin();
- KConfigGroup cg2(config, cmodemgroup);
- while (!it.key().isNull()) {
- cg2.writeEntry(it.key(), "");
- it++;
+ if( !map.isEmpty())
+ {
+ it = map.begin();
+ KConfigGroup cg2(config, cmodemgroup);
+ while (!it.key().isEmpty()) {
+ if(!it.key().isEmpty())
+ cg2.writeEntry(it.key(), "");
+ it++;
+ }
}
-
modemhighcount--;
if(cmodem > modemhighcount)
cmodem = modemhighcount;

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
+


++++++ kdenetwork-3.97.2.tar.bz2 -> kdenetwork-4.0.0.tar.bz2 ++++++
KDE/kdenetwork4/kdenetwork-3.97.2.tar.bz2
/mounts/work_src_done/STABLE/kdenetwork4/kdenetwork-4.0.0.tar.bz2 differ: byte
11, line 1



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread