commit kdebase4-openSUSE for openSUSE:12.1
Hello community,
here is the log from the commit of package kdebase4-openSUSE for openSUSE:12.1
checked in at 2011-11-08 17:37:59
Comparing /work/SRC/openSUSE:12.1/kdebase4-openSUSE (Old)
and /work/SRC/openSUSE:12.1/.kdebase4-openSUSE.new (New)
Package is kdebase4-openSUSE, Maintainer is kde-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.1/kdebase4-openSUSE/kdebase4-openSUSE.changes
2011-11-05 11:16:36.0 +0100
+++ /work/SRC/openSUSE:12.1/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes
2011-11-08 17:37:59.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov 8 15:04:47 UTC 2011 - idon...@suse.com
+
+- Add kdebase4-openSUSE-bnc721114.patch to fix bnc#721114
+- Small spec cleanup
+
+---
New:
kdebase4-openSUSE-bnc721114.patch
Other differences:
--
++ kdebase4-openSUSE.spec ++
--- /var/tmp/diff_new_pack.baI847/_old 2011-11-08 17:38:00.0 +0100
+++ /var/tmp/diff_new_pack.baI847/_new 2011-11-08 17:38:00.0 +0100
@@ -43,6 +43,7 @@
Source3:sysinfo.suse.tar.bz2
Patch1: link-to-qtxml.patch
Patch2: noproxy.diff
+Patch3: kdebase4-openSUSE-bnc721114.patch
BuildRequires: fdupes
BuildRequires: hwinfo-devel
BuildRequires: libkde4-devel
@@ -126,6 +127,8 @@
%setup -q -n %{name} -a 1
%patch1
%patch2 -p1
+%patch3 -p1
+
cd sysinfo
tar xvf %{SOURCE3}
++ kdebase4-openSUSE-bnc721114.patch ++
Index:
kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/Office.desktop
===
---
kdebase4-openSUSE.orig/config-files/usr/share/kde4/config/SuSE/default/Office.desktop
+++
kdebase4-openSUSE/config-files/usr/share/kde4/config/SuSE/default/Office.desktop
@@ -2,7 +2,7 @@
Name=Office
Protocols=file;ftp;http;
MimeType=application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;
-Exec=oofromtemplate
+Exec=libreoffice
Icon=libreoffice-startcenter
Path=$HOME
Type=Application
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kdebase4-openSUSE for openSUSE:12.1
Hello community,
here is the log from the commit of package kdebase4-openSUSE for openSUSE:12.1
checked in at 2011-11-05 10:57:14
Comparing /work/SRC/openSUSE:12.1/kdebase4-openSUSE (Old)
and /work/SRC/openSUSE:12.1/.kdebase4-openSUSE.new (New)
Package is kdebase4-openSUSE, Maintainer is kde-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.1/kdebase4-openSUSE/kdebase4-openSUSE.changes
2011-11-02 11:54:36.0 +0100
+++ /work/SRC/openSUSE:12.1/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes
2011-11-05 11:16:36.0 +0100
@@ -1,0 +2,7 @@
+Fri Nov 4 13:00:05 UTC 2011 - co...@suse.com
+
+- do not set a proxy by default, we just don't know and
+ KDE requires root password for package updates if there is
+ one set (even if empty variables)
+
+---
New:
noproxy.diff
Other differences:
--
++ kdebase4-openSUSE.spec ++
--- /var/tmp/diff_new_pack.trw36I/_old 2011-11-05 11:16:45.0 +0100
+++ /var/tmp/diff_new_pack.trw36I/_new 2011-11-05 11:16:45.0 +0100
@@ -42,6 +42,7 @@
Source2:plasma-change-defaults.diff
Source3:sysinfo.suse.tar.bz2
Patch1: link-to-qtxml.patch
+Patch2: noproxy.diff
BuildRequires: fdupes
BuildRequires: hwinfo-devel
BuildRequires: libkde4-devel
@@ -124,6 +125,7 @@
%prep
%setup -q -n %{name} -a 1
%patch1
+%patch2 -p1
cd sysinfo
tar xvf %{SOURCE3}
++ noproxy.diff ++
diff --git a/config-files/etc/kde4/share/config/kioslaverc
b/config-files/etc/kde4/share/config/kioslaverc
index de2abb6..5d4d5d7 100644
--- a/config-files/etc/kde4/share/config/kioslaverc
+++ b/config-files/etc/kde4/share/config/kioslaverc
@@ -1,6 +1,5 @@
[Proxy Settings]
NoProxyFor=NO_PROXY
-ProxyType=4
ftpProxy=FTP_PROXY
httpProxy=HTTP_PROXY
httpsProxy=HTTPS_PROXY
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
