Hello community,
here is the log from the commit of package kdebase3-SuSE for openSUSE:Factory checked in at 2014-12-01 14:01:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase3-SuSE (Old)
and /work/SRC/openSUSE:Factory/.kdebase3-SuSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3-SuSE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase3-SuSE/kdebase3-SuSE.changes 2014-03-09 18:26:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase3-SuSE.new/kdebase3-SuSE.changes 2014-12-01 14:01:32.000000000 +0100
@@ -1,0 +2,12 @@
+Sat Nov 29 22:18:00 UTC 2014 - Led
+
+- fix duplicate License entries in package
+ kdebase3-SuSE-branding-openSUSE
+
+-------------------------------------------------------------------
+Fri Nov 21 00:12:00 UTC 2014 - Led
+
+- fix bashisms in scripts
+ kdebase-SuSE-fix-bashisms.patch
+
+-------------------------------------------------------------------
New:
----
kdebase-SuSE-fix-bashisms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.3Kmilw/_old 2014-12-01 14:01:33.000000000 +0100
+++ /var/tmp/diff_new_pack.3Kmilw/_new 2014-12-01 14:01:33.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kdebase3-SuSE
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,6 +13,8 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
%if %suse_version > 1140
%define with_hal 0
@@ -21,9 +23,18 @@
%endif
Name: kdebase3-SuSE
-BuildRequires: ImageMagick db-devel dbus-1-qt3-devel desktop-data-openSUSE
-BuildRequires: hwinfo-devel kdebase3-devel libelf-devel lzma-alpha-devel rpm-devel yast2 yast2-theme-openSUSE
+BuildRequires: ImageMagick
+BuildRequires: db-devel
+BuildRequires: dbus-1-qt3-devel
+BuildRequires: desktop-data-openSUSE
+BuildRequires: hwinfo-devel
BuildRequires: kdebase3 > 3.5.1
+BuildRequires: kdebase3-devel
+BuildRequires: libelf-devel
+BuildRequires: lzma-alpha-devel
+BuildRequires: rpm-devel
+BuildRequires: yast2
+BuildRequires: yast2-theme-openSUSE
%if %suse_version <= 1210
BuildRequires: libpng14-compat-devel
%endif
@@ -32,15 +43,31 @@
Requires: kde3-kio_sysinfo
%endif
BuildRequires: unsermake
+Summary: SUSE KDE Extension
License: GPL-2.0
Group: System/GUI/KDE
-Summary: SUSE KDE Extension
-Obsoletes: kdebase-SuSE kdebase3-BILD
-Provides: kdebase-SuSE kdebase3-BILD
-Obsoletes: kdebase-yast2, susehelpcenter, SuSE-Wizard, susewm-kcmyast, kdebase3-NLD
-Provides: kdebase-yast2, susehelpcenter, suse_help_viewer, base3-theme, SuSE-Wizard, susewm-kcmyast, kdebase3-NLD
-Requires: kdebase3 yast2_theme susehelp zypper kde-susetranslations
+Obsoletes: kdebase-SuSE
+Obsoletes: kdebase3-BILD
+Provides: kdebase-SuSE
+Provides: kdebase3-BILD
+Obsoletes: SuSE-Wizard
+Obsoletes: kdebase-yast2
+Obsoletes: kdebase3-NLD
+Obsoletes: susehelpcenter
+Obsoletes: susewm-kcmyast
+Provides: SuSE-Wizard
+Provides: base3-theme
+Provides: kdebase-yast2
+Provides: kdebase3-NLD
+Provides: suse_help_viewer
+Provides: susehelpcenter
+Provides: susewm-kcmyast
+Requires: kde-susetranslations
+Requires: kdebase3
+Requires: susehelp
Requires: xdpyinfo
+Requires: yast2_theme
+Requires: zypper
# opened by suseplugger
Suggests: yast2-bluetooth,yast2-country,yast2-mouse,yast2-network,yast2-printer,yast2-scanner,yast2-sound,yast2-storage,yast2-tv,yast2-x11
Obsoletes: kdebase3-Personal
@@ -48,14 +75,14 @@
PreReq: %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 11.3
-Release: 1
+Release: 0
Source0: kdebase-SuSE-%{version}.tar.bz2
Source2: kdebase3-SuSE-displaymanager.fillup
Source3: kdebase3-SuSE-windowmanager.fillup
Source4: media.desktop
-Requires: desktop-branding
-Requires: %{name}-lang
Requires: %{name}-branding
+Requires: %{name}-lang
+Requires: desktop-branding
Recommends: kde3-gtk-qt-engine kde3-knemo
Patch0: adjust-settings.patch
Patch1: branding-12_1.patch
@@ -63,6 +90,7 @@
Patch3: kdebase3-suse-libpng14.patch
Patch4: enable-shadows.patch
Patch5: libreoffice-desktop.patch
+Patch6: kdebase-SuSE-fix-bashisms.patch
%description
This package contains the standard SUSE desktop and menu extensions for
@@ -70,8 +98,8 @@
%package -n kde3-kio_sysinfo
-License: GPL-2.0+
Summary: System Information KIO-Slave
+License: GPL-2.0+
Group: System/GUI/KDE
Provides: kdebase3-SuSE:/opt/kde3/share/services/ksysinfopart.desktop
Requires: %{name}-branding = %{version}
@@ -84,7 +112,6 @@
Summary: SUSE KDE Extension
License: GPL-2.0+
Group: System/GUI/KDE
-Summary: SUSE KDE Extension
Provides: %{name}-branding = %{version}
Supplements: packageand(kdebase3-SuSE:branding-openSUSE)
Conflicts: otherproviders(%{name}-branding)
@@ -119,6 +146,7 @@
%if %{suse_version} > 1310
rm -rf krpmview
%endif
+%patch6 -p1
update_admin
++++++ kdebase-SuSE-fix-bashisms.patch ++++++
diff -Ndur kdebase-SuSE/config-files/opt/kde3/bin/kde_iso_mount kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/kde_iso_mount
--- kdebase-SuSE/config-files/opt/kde3/bin/kde_iso_mount 2007-08-06 10:44:25.000000000 +0300
+++ kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/kde_iso_mount 2014-11-21 02:08:24.243991457 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
directory=`kdialog --getexistingdirectory $HOME`
diff -Ndur kdebase-SuSE/config-files/opt/kde3/bin/startkde.pick_wallpaper kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/startkde.pick_wallpaper
--- kdebase-SuSE/config-files/opt/kde3/bin/startkde.pick_wallpaper 2006-05-12 15:39:17.000000000 +0300
+++ kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/startkde.pick_wallpaper 2014-11-21 02:08:12.017992284 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
-function pick_wallpaper
+pick_wallpaper()
{
WALLPAPER_BASE="default-"
X=`LC_ALL=C xdpyinfo|grep dimensions:|head -n 1|cut -dx -f1|egrep -o '[0-9]+'`
diff -Ndur kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/startkde.theme
--- kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme 2008-05-19 14:55:35.000000000 +0300
+++ kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/startkde.theme 2014-11-21 02:07:54.189993490 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# vim:sw=4:et
#
@@ -32,7 +32,7 @@
#
# copy an application icon
#
-function copy_app_icon {
+copy_app_icon() {
TEMPLATE_APP="$1"
DIRECTION="$2"
@@ -53,12 +53,12 @@
fi
}
-function create_default_desktop {
+create_default_desktop() {
#
# Create default desktop
#
- [ `kreadconfig --file kdesktoprc --group General --key CopyDesktopLinks --default true` == "false" ] && return
+ [ `kreadconfig --file kdesktoprc --group General --key CopyDesktopLinks --default true` = "false" ] && return
mkdir -p $KDEHOME/share/apps/default_desktop
mkdir -p $KDEHOME/Autostart/
@@ -109,7 +109,7 @@
fi
}
-function copy_default_user {
+copy_default_user() {
kdehome="$1"
TEMPLATE_DIR=/opt/kde3/share/config/SuSE/default/
@@ -164,8 +164,9 @@
#
mkdir -p "${kdehome}"/share/apps/konqueror/toolbar/
if [ ! -e "${kdehome}"/share/apps/konqueror/bookmarks.xml ]; then
- [ -e "${TEMPLATE_DIR}"/bookmarks.${LANG:0:2}.xml ] && \
- cp -a "${TEMPLATE_DIR}"/bookmarks.${LANG:0:2}.xml "${kdehome}"/share/apps/konqueror/bookmarks.xml || \
+ local lang="$(expr substr "$LANG" 1 2)"
+ [ -e "${TEMPLATE_DIR}"/bookmarks.$lang.xml ] && \
+ cp -a "${TEMPLATE_DIR}"/bookmarks.$lang.xml "${kdehome}"/share/apps/konqueror/bookmarks.xml || \
cp -a "${TEMPLATE_DIR}"/bookmarks.xml "${kdehome}"/share/apps/konqueror/bookmarks.xml
fi
@@ -206,7 +207,7 @@
chmod og-rwx "${kdehome}"
}
-function copy_default_root {
+copy_default_root() {
kdehome="$1"
. /etc/sysconfig/language
diff -Ndur kdebase-SuSE/config-files/opt/kde3/bin/YaSTadminSession kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/YaSTadminSession
--- kdebase-SuSE/config-files/opt/kde3/bin/YaSTadminSession 2006-09-11 18:06:38.000000000 +0300
+++ kdebase-SuSE-fix-bashisms/config-files/opt/kde3/bin/YaSTadminSession 2014-11-21 02:08:16.881991955 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if [ ! -e /root/.qt/qtrc ]; then
mkdir /root/.qt
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org