The package rpms/deepin-daemon.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/deepin-daemon.git/commit/?id=55c9c05... https://src.fedoraproject.org/cgit/rpms/deepin-daemon.git/commit/?id=f65e866....
Change: +%ifnarch s390 s390x %{arm} +ExcludeArch: ppc64le aarch64
Thanks.
Full change: ============
commit 3141915650b416b72ce4d6753f4208ef03e246ff Author: mosquito sensor.wen@gmail.com Date: Sat Aug 25 18:22:20 2018 +0800
Release 3.2.20
diff --git a/.gitignore b/.gitignore index 0225c1f..1937819 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dde-daemon-3.2.9.tar.gz /dde-daemon-3.2.21.tar.gz /dde-daemon-3.2.22.tar.gz +/dde-daemon-3.2.20.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 16f86ef..e6efc6a 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,7 +2,7 @@ %global ds_url https://github.com/linuxdeepin/default-settings
Name: deepin-daemon -Version: 3.2.22 +Version: 3.2.20 Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 @@ -44,10 +44,10 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xkbfile) -BuildRequires: golang-deepin-dbus-factory-devel -BuildRequires: golang(pkg.deepin.io/lib) +BuildRequires: golang-deepin-dbus-factory-devel >= 3.1.16 +BuildRequires: golang(pkg.deepin.io/lib) >= 1.2.11 BuildRequires: golang(pkg.deepin.io/lib/fsnotify) -BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) >= 3.1.26 BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory) BuildRequires: golang(github.com/linuxdeepin/go-x11-client) BuildRequires: golang(github.com/BurntSushi/xgb) @@ -99,6 +99,7 @@ sed -i '/systemd/s|lib|usr/lib|' Makefile sed -i 's|lib/NetworkManager|libexec|' network/utils_test.go sed -i 's|/usr/lib|%{_libexecdir}|' \ misc/*services/*.service \ + misc/systemd/services/*.service \ misc/etc/pam.d/deepin-auth \ misc/applications/deepin-toggle-desktop.desktop \ misc/dde-daemon/gesture.json \ @@ -108,7 +109,8 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ session/power/lid_switch.go \ service_trigger/manager.go \ bin/dde-system-daemon/main.go \ - bin/search/main.go + bin/search/main.go \ + accounts/image_blur.go
# Fix grub.cfg path sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go @@ -187,11 +189,8 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
%changelog -* Thu Aug 2 2018 mosquito sensor.wen@gmail.com - 3.2.22-1 -- Update to 3.2.22 - -* Fri Jul 20 2018 mosquito sensor.wen@gmail.com - 3.2.21-1 -- Update to 3.2.21 +* Sat Aug 25 2018 mosquito sensor.wen@gmail.com - 3.2.20-1 +- Update to 3.2.20
* Thu Jul 12 2018 Fedora Release Engineering releng@fedoraproject.org - 3.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 908f4d0..f3bed61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.22.tar.gz) = 6df6d5cebbfd5d71ca31b3812fe8a4892ba4c9607adbdad76f9325d28246c53a267a4b803f6abb42d05c1aa8e349c00c8377a5e9fcb6e47f8bd20d8c2bbf2507 +SHA512 (dde-daemon-3.2.20.tar.gz) = e1b56276b5234ec6a8696dd1da92b1e9276e73756d70177d3be0bdd7a0288d55c1281753237353fecf375d4d3452dfe2b801f6367e87a530a568e9b19c2f7553 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5
commit 91c6d4230aeee90abd15d1f4f08019c8fb6d6b58 Author: mosquito sensor.wen@gmail.com Date: Fri Aug 3 18:33:01 2018 +0800
Release 3.2.22
diff --git a/.gitignore b/.gitignore index b7f74e7..0225c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dde-daemon-3.2.8.tar.gz /dde-daemon-3.2.9.tar.gz /dde-daemon-3.2.21.tar.gz +/dde-daemon-3.2.22.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 4f333a2..16f86ef 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,7 +2,7 @@ %global ds_url https://github.com/linuxdeepin/default-settings
Name: deepin-daemon -Version: 3.2.21 +Version: 3.2.22 Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 @@ -187,6 +187,9 @@ fi %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
%changelog +* Thu Aug 2 2018 mosquito sensor.wen@gmail.com - 3.2.22-1 +- Update to 3.2.22 + * Fri Jul 20 2018 mosquito sensor.wen@gmail.com - 3.2.21-1 - Update to 3.2.21
diff --git a/sources b/sources index 0909aa4..908f4d0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.21.tar.gz) = d19d1aca29657b540fa53b569f22d00cf76f3a0f4b1280f6f14e6c289dd2799ed2deb7db37005dfeae816e6ceb99bcb74971518f9701db98db0d02c146ed59d5 +SHA512 (dde-daemon-3.2.22.tar.gz) = 6df6d5cebbfd5d71ca31b3812fe8a4892ba4c9607adbdad76f9325d28246c53a267a4b803f6abb42d05c1aa8e349c00c8377a5e9fcb6e47f8bd20d8c2bbf2507 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5
commit 2d72bf1eca5e374ad54da8362e3ec91cf8066c4e Author: mosquito sensor.wen@gmail.com Date: Tue Jul 31 23:57:27 2018 +0800
Release 3.2.21
diff --git a/.gitignore b/.gitignore index a4e1921..b7f74e7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dde-daemon-3.2.7.tar.gz /dde-daemon-3.2.8.tar.gz /dde-daemon-3.2.9.tar.gz +/dde-daemon-3.2.21.tar.gz diff --git a/deepin-daemon.spec b/deepin-daemon.spec index fa037b0..4f333a2 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -2,8 +2,8 @@ %global ds_url https://github.com/linuxdeepin/default-settings
Name: deepin-daemon -Version: 3.2.9 -Release: 3%{?dist} +Version: 3.2.21 +Release: 1%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -48,6 +48,7 @@ BuildRequires: golang-deepin-dbus-factory-devel BuildRequires: golang(pkg.deepin.io/lib) BuildRequires: golang(pkg.deepin.io/lib/fsnotify) BuildRequires: golang(pkg.deepin.io/dde/api/dxinput) +BuildRequires: golang(github.com/linuxdeepin/go-dbus-factory) BuildRequires: golang(github.com/linuxdeepin/go-x11-client) BuildRequires: golang(github.com/BurntSushi/xgb) BuildRequires: golang(github.com/BurntSushi/xgbutil) @@ -94,25 +95,28 @@ Daemon handling the DDE session settings
# Fix library exec path sed -i '/deepin/s|lib|libexec|' Makefile +sed -i '/systemd/s|lib|usr/lib|' Makefile sed -i 's|lib/NetworkManager|libexec|' network/utils_test.go sed -i 's|/usr/lib|%{_libexecdir}|' \ misc/*services/*.service \ + misc/etc/pam.d/deepin-auth \ misc/applications/deepin-toggle-desktop.desktop \ + misc/dde-daemon/gesture.json \ misc/dde-daemon/keybinding/system_actions.json \ keybinding/shortcuts/system_shortcut.go \ session/power/constant.go \ session/power/lid_switch.go \ + service_trigger/manager.go \ bin/dde-system-daemon/main.go \ - bin/search/main.go \ - accounts/user.go + bin/search/main.go
# Fix grub.cfg path sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go -sed -i 's|default_background.jpg|default.png|' accounts/user.go
%build export GOPATH="$(pwd)/build:%{gopath}" -%make_build +BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" +%make_build GOBUILD="go build -compiler gc -ldflags "-B $BUILDID""
%install %make_install @@ -163,9 +167,12 @@ fi %files -f %{repo}.lang %doc README.md %license LICENSE +%{_sysconfdir}/pam.d/deepin-auth +%{_sysconfdir}/pam.d/deepin-auth-keyboard %{_libexecdir}/%{name}/ %{_sysusersdir}/%{name}.conf %{_prefix}/lib/systemd/logind.conf.d/10-%{name}.conf +%{_unitdir}/deepin-accounts-daemon.service %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/system-services/*.service %{_datadir}/dbus-1/system.d/*.conf @@ -177,8 +184,12 @@ fi %{_fontconfig_templatedir}/*.conf %{_fontconfig_confdir}/*.conf %{_var}/cache/appearance/ +%{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla
%changelog +* Fri Jul 20 2018 mosquito sensor.wen@gmail.com - 3.2.21-1 +- Update to 3.2.21 + * Thu Jul 12 2018 Fedora Release Engineering releng@fedoraproject.org - 3.2.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources index 31b3f74..0909aa4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dde-daemon-3.2.9.tar.gz) = a1cccec281f3d3930ccac455e3999ff464cc6fc30b5ce533fb81323b179de3ab0ec3e9c74556d9a5c76f1e009f68f652f255522a75c1c2bbf511e8680b81414a +SHA512 (dde-daemon-3.2.21.tar.gz) = d19d1aca29657b540fa53b569f22d00cf76f3a0f4b1280f6f14e6c289dd2799ed2deb7db37005dfeae816e6ceb99bcb74971518f9701db98db0d02c146ed59d5 SHA512 (default-settings-2016.9.8.tar.gz) = 174875142f049ed270a15e4334d9afa59275aa8db84cb15942905a17f2733555fd3e8ae4557c6caeab0bde00bcd606f294d058d0a8d7f584d54a168512b117f5
commit aa16ac25cf42657ed2ccb9ccbf3a121398b4da76 Author: Fedora Release Engineering releng@fedoraproject.org Date: Thu Jul 12 22:42:26 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 88cf9d6..fa037b0 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -3,7 +3,7 @@
Name: deepin-daemon Version: 3.2.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -179,6 +179,9 @@ fi %{_var}/cache/appearance/
%changelog +* Thu Jul 12 2018 Fedora Release Engineering releng@fedoraproject.org - 3.2.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 19 2018 mosquito sensor.wen@gmail.com - 3.2.9-2 - Nothing providers grub2 in s390x and armv7hl.
commit f65e866b224fa777c3dacb28f14db05d796d7438 Author: mosquito sensor.wen@gmail.com Date: Tue Mar 20 19:52:21 2018 +0800
Exclude aarch64
diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 63190cc..88cf9d6 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -14,14 +14,13 @@ Patch0: https://raw.github.com/jouyouyun/tap-gesture-patches/master/patc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # https://github.com/golang/go/issues/21947 -ExcludeArch: ppc64le +ExcludeArch: ppc64le aarch64 BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: deepin-gettext-tools BuildRequires: deepin-gir-generator BuildRequires: fontpackages-devel BuildRequires: librsvg2-tools BuildRequires: pam-devel -BuildRequires: rsync BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gnome-keyring-1) @@ -111,10 +110,6 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go sed -i 's|default_background.jpg|default.png|' accounts/user.go
-# Copy files to gopath directory -sed -i -E 's|$(dir.*)|${GOPKG_PREFIX}|' Makefile -sed -i -E 's|ln.{16}|rsync -a --exclude ${GOPATH_DIR} *|' Makefile - %build export GOPATH="$(pwd)/build:%{gopath}" %make_build
commit 36b3b8dcbcc97ef44c89e8b2d30052583ac2e92e Author: mosquito sensor.wen@gmail.com Date: Tue Mar 20 04:20:31 2018 +0800
Add breq rsync
diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 425d255..63190cc 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -21,6 +21,7 @@ BuildRequires: deepin-gir-generator BuildRequires: fontpackages-devel BuildRequires: librsvg2-tools BuildRequires: pam-devel +BuildRequires: rsync BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gnome-keyring-1)
commit cbdf88b0e2dbf46dceba89e58d4663b9cf41e9d8 Author: mosquito sensor.wen@gmail.com Date: Tue Mar 20 04:10:07 2018 +0800
Copy files to gopath directory
diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 42e82fd..425d255 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -110,6 +110,10 @@ sed -i 's|/usr/lib|%{_libexecdir}|' \ sed -i 's|boot/grub|boot/grub2|' grub2/{theme,log,entry,grub_params}.go sed -i 's|default_background.jpg|default.png|' accounts/user.go
+# Copy files to gopath directory +sed -i -E 's|$(dir.*)|${GOPKG_PREFIX}|' Makefile +sed -i -E 's|ln.{16}|rsync -a --exclude ${GOPATH_DIR} *|' Makefile + %build export GOPATH="$(pwd)/build:%{gopath}" %make_build
commit 55c9c05908a8b5cee4cd06e4f51b6d92dd24b96d Author: mosquito sensor.wen@gmail.com Date: Tue Mar 20 01:46:53 2018 +0800
Nothing providers grub2 in s390x and armv7hl
diff --git a/deepin-daemon.spec b/deepin-daemon.spec index 295a4e3..42e82fd 100644 --- a/deepin-daemon.spec +++ b/deepin-daemon.spec @@ -3,7 +3,7 @@
Name: deepin-daemon Version: 3.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -60,9 +60,11 @@ BuildRequires: golang(gopkg.in/yaml.v2)
Requires: deepin-desktop-base Requires: deepin-desktop-schemas -Requires: deepin-grub2-themes Requires: deepin-notifications +%ifnarch s390 s390x %{arm} +Requires: deepin-grub2-themes Requires: acpid +%endif Requires: bluez-libs Requires: gvfs Requires: iw @@ -177,6 +179,9 @@ fi %{_var}/cache/appearance/
%changelog +* Mon Mar 19 2018 mosquito sensor.wen@gmail.com - 3.2.9-2 +- Nothing providers grub2 in s390x and armv7hl. + * Fri Feb 16 2018 mosquito sensor.wen@gmail.com - 3.2.9-1 - Update to 3.2.9
arch-excludes@lists.fedoraproject.org