Hello community,
here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-05-08 06:45:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old)
and /work/SRC/openSUSE:Factory/.kdebase3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2012-04-20 15:17:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-05-08 06:45:39.000000000 +0200
@@ -1,0 +2,16 @@
+Wed May 2 00:33:42 UTC 2012 - anixx@opensuse.org
+
+- make kdebase3-ksysguard installable in parallel with
+ kdebase4-worspace-ksysguardd, remove any file conflicts
+
+-------------------------------------------------------------------
+Wed Apr 25 17:29:42 UTC 2012 - dimstar@opensuse.org
+
+- Add fileshareset2-gcc47.patch: Fix build with gcc 4.7.
+
+-------------------------------------------------------------------
+Wed Apr 25 16:05:45 UTC 2012 - anixx@opensuse.org
+
+- add a patch to fix sftp on modern systems
+
+-------------------------------------------------------------------
New:
----
fileshareset2-gcc47.patch
kdebase-trinity-sftp-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.fwQr7C/_old 2012-05-08 06:45:56.000000000 +0200
+++ /var/tmp/diff_new_pack.fwQr7C/_new 2012-05-08 06:45:56.000000000 +0200
@@ -30,6 +30,7 @@
BuildRequires: graphviz
BuildRequires: kdelibs3-devel
BuildRequires: krb5-devel
+BuildRequires: libdbus-1-qt3-0-devel
BuildRequires: liblazy-devel
BuildRequires: libsmbclient-devel
BuildRequires: mDNSResponder-devel
@@ -44,7 +45,6 @@
BuildRequires: utempter
BuildRequires: xorg-x11
BuildRequires: xorg-x11-libfontenc-devel
-BuildRequires: libdbus-1-qt3-0-devel
%if %suse_version >= 1130
BuildRequires: libusb-compat-devel
%endif
@@ -59,13 +59,19 @@
%endif
%define qt_path /usr/lib/qt3
%define kde_path /opt/kde3
-Provides: windowmanager kfontinst kdebase3-konqueror kdebase3-khotkeys
-Obsoletes: kfontinst kdebase3-konqueror kdebase3-khotkeys
+Provides: kdebase3-khotkeys
+Provides: kdebase3-konqueror
+Provides: kfontinst
+Provides: windowmanager
+Obsoletes: kdebase3-khotkeys
+Obsoletes: kdebase3-konqueror
+Obsoletes: kfontinst
# bug437293
%ifarch ppc64
Obsoletes: kdebase3-64bit
%endif
-Requires: xorg-x11 misc-console-font
+Requires: misc-console-font
+Requires: xorg-x11
Recommends: kdelibs3_doc
Recommends: gdb
PreReq: fileshareset
@@ -73,7 +79,8 @@
Conflicts: kdebase3-SuSE <= 9.0
PreReq: /bin/sh fileutils permissions
%if %suse_version < 1120
-Requires: kdebase3-apps kdebase3-workspace
+Requires: kdebase3-apps
+Requires: kdebase3-workspace
%endif
%if %suse_version > 1130
Provides: kdebase3-beagle = 3.5.10
@@ -282,6 +289,8 @@
Patch275: kicker-height.patch
Patch276: kdebase-gcc47.patch
Patch277: printmanager-desktop-fix.patch
+Patch278: kdebase-trinity-sftp-fix.diff
+Patch279: fileshareset2-gcc47.patch
%description
This package contains kdebase, one of the basic packages of the K
@@ -337,7 +346,12 @@
Kate, Konqueror and KWrite.
%package devel
-Requires: kdelibs3-devel libdbus-1-qt3-0-devel kdebase3 = %version kdebase3-apps = %version kdebase3-runtime = %version kdebase3-workspace = %version
+Requires: kdebase3 = %version
+Requires: kdebase3-apps = %version
+Requires: kdebase3-runtime = %version
+Requires: kdebase3-workspace = %version
+Requires: kdelibs3-devel
+Requires: libdbus-1-qt3-0-devel
Summary: KDE Base Package: Base, Build Environment
Group: System/GUI/KDE
@@ -354,11 +368,11 @@
# usesubdirs kdm
Summary: The KDE login and display manager
Group: System/GUI/KDE
+Provides: kdebase3-kdm-SLD:/opt/kde3/bin/kdm
Provides: kdebase3:/opt/kde3/bin/kdm
Provides: kdebase:/opt/kde2/bin/kdm
-Provides: kdebase3-kdm-SLD:/opt/kde3/bin/kdm
-Requires: xorg-x11
Requires: kdebase3-runtime >= %version
+Requires: xorg-x11
PreReq: %fillup_prereq /bin/grep
%description kdm
@@ -633,6 +647,10 @@
%patch275 -p1
%patch276 -p1
%patch277 -p1
+%patch278 -p1
+pushd ../fileshareset2
+%patch279 -p1
+popd
%define _mandir /opt/kde3/share/man
@@ -647,6 +665,9 @@
cd ../kdebase-%{kde_version}
update_admin
+sed -i 's|ksysguarddrc|ksysguardd3rc|g' ksysguard/ksysguardd/Makefile.am
+sed -i 's|ksysguarddrc|ksysguardd3rc|g' ksysguard/ksysguardd/Makefile.in
+
%build
. /etc/opt/kde3/common_options
DEBUG="--disable-debug"
@@ -703,8 +724,8 @@
ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/bin/kde
ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/bin/startkde3
ln -sf rcxdm ${RPM_BUILD_ROOT}/usr/sbin/rckdm
-mv ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd ${RPM_BUILD_ROOT}/usr/bin/ksysguardd
-ln -sf /usr/bin/ksysguardd ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
+#mv ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd ${RPM_BUILD_ROOT}/usr/bin/ksysguardd
+#ln -sf /usr/bin/ksysguardd ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
install -d ${RPM_BUILD_ROOT}/opt/kde3/env
install -D -m 0755 %SOURCE16 ${RPM_BUILD_ROOT}/opt/kde3/shutdown/stopkde.suse.sh
mkdir -p "${RPM_BUILD_ROOT}"/etc/security/
@@ -715,11 +736,11 @@
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png
-install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd
+install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd3
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/
ln -s ../pics/users/root1.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/root.face.icon
ln -s ../pics/users/default2.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/.default.face.icon
-ln -sf /etc/init.d/ksysguardd $RPM_BUILD_ROOT/usr/sbin/rcksysguardd
+ln -sf /etc/init.d/ksysguardd3 $RPM_BUILD_ROOT/usr/sbin/rcksysguardd3
install -D -m 644 %SOURCE15 $RPM_BUILD_ROOT/etc/slp.reg.d/ksysguardd.reg
# even if we use smbro
install -D -m 644 kioslave/smb/smb-network.desktop $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/dirtree/remote/smb-network.desktop
@@ -842,6 +863,7 @@
cp -f %{SOURCE24} $RPM_BUILD_ROOT/opt/kde3/share/config
sed -i 5i\ 'killall udisks-glue; /usr/bin/udisks-glue --config /opt/kde3/share/config/udisks-glue.conf' $RPM_BUILD_ROOT/opt/kde3/bin/startkde
%endif
+mv $RPM_BUILD_ROOT/etc/ksysguarddrc $RPM_BUILD_ROOT/etc/ksysguardd3rc
%pre
# we have this as link
@@ -892,6 +914,7 @@
%postun
%insserv_cleanup
/sbin/ldconfig
+
%post runtime -p /sbin/ldconfig
%postun runtime -p /sbin/ldconfig
@@ -1419,11 +1442,10 @@
%files ksysguardd
%defattr(-,root,root)
%dir /etc/slp.reg.d
-/usr/bin/ksysguardd
/opt/kde3/bin/ksysguardd
-%config(noreplace) /etc/ksysguarddrc
-/etc/init.d/ksysguardd
-/usr/sbin/rcksysguardd
+%config(noreplace) /etc/ksysguardd3rc
+/etc/init.d/ksysguardd3
+/usr/sbin/rcksysguardd3
%config(noreplace) /etc/slp.reg.d/*
%if %suse_version < 1140
++++++ fileshareset2-gcc47.patch ++++++
Index: fileshareset2/src/fssShareNfs.cpp
===================================================================
--- fileshareset2.orig/src/fssShareNfs.cpp
+++ fileshareset2/src/fssShareNfs.cpp
@@ -20,6 +20,7 @@
#include "fssShareNfs.h"
#include <iostream>
#include <sstream>
+#include