Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-desktop-schemas for
openSUSE:Factory checked in at 2021-06-02 22:11:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-desktop-schemas (Old)
and /work/SRC/openSUSE:Factory/.deepin-desktop-schemas.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-desktop-schemas"
Wed Jun 2 22:11:10 2021 rev:2 rq:894967 version:5.9.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-desktop-schemas/deepin-desktop-schemas.changes
2021-04-26 16:39:29.042062241 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-desktop-schemas.new.1898/deepin-desktop-schemas.changes
2021-06-02 22:11:24.396123241 +0200
@@ -1,0 +2,5 @@
+Thu May 6 13:03:21 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update default settings.
+
+-------------------------------------------------------------------
---
/work/SRC/openSUSE:Factory/deepin-desktop-schemas/deepin-override-tool.changes
2021-04-26 16:39:29.102062336 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-desktop-schemas.new.1898/deepin-override-tool.changes
2021-06-02 22:11:24.456123236 +0200
@@ -1,0 +2,6 @@
+Sat May 22 11:58:05 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Keep golang version on 1.15 on Tumbleweed, the project does not support
+ golang 1.16+
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-desktop-schemas.spec ++++++
--- /var/tmp/diff_new_pack.pUU3mn/_old 2021-06-02 22:11:25.000123192 +0200
+++ /var/tmp/diff_new_pack.pUU3mn/_new 2021-06-02 22:11:25.004123191 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-desktop-schemas
#
-# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,21 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: deepin-desktop-schemas
Version: 5.9.5
Release: 0
Summary: GSettings deepin desktop-wide schemas
-License: GPL-3.0+
+License: GPL-3.0-or-later
+Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-desktop-schemas
Source0:
https://github.com/linuxdeepin/deepin-desktop-schemas/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: use-override-tool-in-system-default.patch
-Group: System/GUI/Other
BuildRequires: deepin-override-tool
-BuildRequires: python3
+BuildRequires: fdupes
BuildRequires: glib2-tools
+BuildRequires: python3
Requires: dconf
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -37,6 +39,7 @@
%package -n deepin-desktop-schemas-branding-upstream
Summary: Upstream Branding of the Deepin Desktop Environment
+Group: System/GUI/Other
Requires: deepin-desktop-schemas
Conflicts: otherproviders(deepin-desktop-schemas-branding)
Provides: deepin-desktop-schemas-branding = %{version}
@@ -48,14 +51,17 @@
%prep
%autosetup -p1
sed -i
's|backgrounds/default_background.jpg|wallpapers/openSUSEdefault/contents/images/1920x1080.jpg|g'
\
- overrides/common/com.deepin.wrap.gnome.desktop.override
-sed -i '/display-mode/s|fashion|efficient|'
overrides/common/desktop/dock.override
+overrides/common/com.deepin.wrap.gnome.desktop.override
%build
make %{?_smp_mflags}
%install
%make_install
+install -m 0644 %{buildroot}%{_datadir}/deepin-desktop-schemas/server-override
\
+%{buildroot}%{_datadir}/glib-2.0/schemas/91_deepin_product.gschema.override
+
+%fdupes %{buildroot}%{_datadir}
%files
%defattr(-,root,root,-)
@@ -68,11 +74,13 @@
%exclude %{_datadir}/glib-2.0/schemas/com.deepin.dde.appearance.gschema.xml
%exclude %{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.gschema.xml
%exclude %{_datadir}/glib-2.0/schemas/com.deepin.dde.desktop.gschema.xml
+%exclude %{_datadir}/glib-2.0/schemas/com.deepin.xsettings.gschema.xml
%files -n deepin-desktop-schemas-branding-upstream
%defattr(-,root,root,-)
%{_datadir}/glib-2.0/schemas/com.deepin.dde.appearance.gschema.xml
%{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.gschema.xml
%{_datadir}/glib-2.0/schemas/com.deepin.dde.desktop.gschema.xml
+%{_datadir}/glib-2.0/schemas/com.deepin.xsettings.gschema.xml
%changelog
++++++ deepin-override-tool.spec ++++++
--- /var/tmp/diff_new_pack.pUU3mn/_old 2021-06-02 22:11:25.024123189 +0200
+++ /var/tmp/diff_new_pack.pUU3mn/_new 2021-06-02 22:11:25.028123189 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-override-tool
#
-# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
%define import_path github.com/linuxdeepin/deepin-desktop-schemas
%define provider github
%define provider_tld com
@@ -25,14 +26,17 @@
Version: 5.9.5
Release: 0
Summary: Deepin override tool
-License: GPL-3.0+
+License: GPL-3.0-or-later
+Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-desktop-schemas
Source0:
https://github.com/linuxdeepin/deepin-desktop-schemas/archive/%{version}/%{repo}-%{version}.tar.gz
-Group: System/GUI/Other
-# BuildRequires: golang(API) = 1.11
+%if 0%{?suse_version} > 1500
+BuildRequires: golang(API) = 1.15
+%endif
BuildRequires: golang-packaging
BuildRequires: golang(pkg.deepin.io/lib/keyfile)
Requires: dconf
+AutoReqProv: Off
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -43,7 +47,6 @@
Group: Development/Languages/Golang
Requires: golang(pkg.deepin.io/lib/keyfile)
BuildArch: noarch
-AutoReqProv: On
AutoReq: Off
%{go_provides}
