Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-desktop-base for
openSUSE:Factory checked in at 2021-04-29 01:37:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-desktop-base (Old)
and /work/SRC/openSUSE:Factory/.deepin-desktop-base.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-desktop-base"
Thu Apr 29 01:37:45 2021 rev:3 rq:888888 version:20.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-desktop-base/deepin-desktop-base.changes
2021-04-26 16:39:28.394061209 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-desktop-base.new.12324/deepin-desktop-base.changes
2021-04-29 01:38:40.786602197 +0200
@@ -1,0 +2,10 @@
+Tue Apr 27 05:25:03 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Install distribution.info
+
+-------------------------------------------------------------------
+Sun Apr 25 12:22:05 UTC 2021 - Hillwood Yang <[email protected]>
+
+- Update do-not-installl-os-version.patch, fix build on ppc64
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-desktop-base.spec ++++++
--- /var/tmp/diff_new_pack.xtpVJ3/_old 2021-04-29 01:38:41.278602895 +0200
+++ /var/tmp/diff_new_pack.xtpVJ3/_new 2021-04-29 01:38:41.282602900 +0200
@@ -25,6 +25,7 @@
License: GPL-3.0-or-later
Group: System/GUI/Other
URL: https://github.com/linuxdeepin/deepin-desktop-base
+Requires: distribution-logos
Source0:
https://github.com/linuxdeepin/deepin-desktop-base/archive/%{_version}/%{name}-%{_version}.tar.gz
# PATCH-FIX-OPENSUSE do-not-installl-os-version.patch [email protected] -
Don't install deepin os information
Patch0: do-not-installl-os-version.patch
@@ -52,6 +53,7 @@
%install
%make_install
+install -Dm644 distribution.info %{buildroot}%{_datadir}/deepin/
# Make a symlink for deepin-version
ln -sfv %{_datadir}/deepin/desktop-version %{buildroot}/etc/deepin-version
@@ -62,6 +64,7 @@
%config(noreplace) %{_sysconfdir}/appstore.json
%{_sysconfdir}/*-version
%dir %{_datadir}/deepin/
+%{_datadir}/deepin/distribution.info
%{_datadir}/deepin/*-version
%dir %{_datadir}/distro-info
%dir %{_datadir}/i18n
++++++ do-not-installl-os-version.patch ++++++
--- /var/tmp/diff_new_pack.xtpVJ3/_old 2021-04-29 01:38:41.314602946 +0200
+++ /var/tmp/diff_new_pack.xtpVJ3/_new 2021-04-29 01:38:41.318602951 +0200
@@ -1,7 +1,7 @@
diff -Nur deepin-desktop-base-2021.3.10/Makefile
deepin-desktop-base-2021.3.10-new/Makefile
--- deepin-desktop-base-2021.3.10/Makefile 2021-03-10 16:14:25.000000000
+0800
-+++ deepin-desktop-base-2021.3.10-new/Makefile 2021-04-15 21:31:51.265094237
+0800
-@@ -14,23 +14,19 @@
++++ deepin-desktop-base-2021.3.10-new/Makefile 2021-04-25 20:17:18.019353488
+0800
+@@ -14,23 +14,21 @@
endif
ifeq (${ARCH_BUILD}, x86_64)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
@@ -9,6 +9,8 @@
- else ifeq (${ARCH_BUILD}, x86_32)
+ else ifeq (${ARCH_BUILD}, i686)
+ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
++ else ifeq (${ARCH_BUILD}, ppc64)
++ sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
+ else ifeq (${ARCH_BUILD}, ppc64le)
sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/desktop-version.in > files/desktop-version
- sed -e "s|@@VERSION@@|$(VERSION)|g" -e
"s|@@RELEASE@@|$(RELEASE)|g" files/os-version-amd > files/os-version
@@ -28,7 +30,7 @@
install:
mkdir -p ${DESTDIR}/etc
-@@ -44,9 +40,7 @@
+@@ -44,9 +42,7 @@
install -Dm644 files/desktop-version
${DESTDIR}/usr/lib/deepin/desktop-version
install -Dm644 files/lsb-release ${DESTDIR}/etc/lsb-release
install -Dm644 files/appstore.json ${DESTDIR}/etc/appstore.json
@@ -38,7 +40,7 @@
#install -Dm644 files/eff98ab2b2d91574a79fabd2b79eb7a9.jpg
${DESTDIR}/var/cache/image-blur/eff98ab2b2d91574a79fabd2b79eb7a9.jpg
[ -e files/systemd.conf ] && install -Dm644 files/systemd.conf
${DESTDIR}/etc/systemd/system.conf.d/deepin-base.conf
[ -e files/logind.conf ] && install -Dm644 files/logind.conf
${DESTDIR}/etc/systemd/logind.conf.d/deepin-base.conf
-@@ -54,4 +48,3 @@
+@@ -54,4 +50,3 @@
install -Dm644 files/Deepin.mirrors
${DESTDIR}/usr/share/python-apt/templates/Deepin.mirrors
clean:
rm -f files/desktop-version
