Accepting request 894969 from X11:Deepin
- Keep golang version on 1.15 on Tumbleweed, the project does not support golang 1.16+ (forwarded request 894959 from hillwood) OBS-URL: https://build.opensuse.org/request/show/894969 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/deepin-daemon?expand=0&rev=2
This commit is contained in:
commit
ac2507fcbe
3
dde-daemon-5.13.10.tar.gz
Normal file
3
dde-daemon-5.13.10.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4e78c911628090c7bf5370355d5eaee7867996adea70602fd1ca57e00b3a9a3a
|
||||||
|
size 3278693
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f79d27f67f94df0e2a3a7b06328355d0e87c02847bcec45a8b3597a950265440
|
|
||||||
size 3279753
|
|
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat May 22 11:53:04 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
- Keep golang version on 1.15 on Tumbleweed, the project does not support
|
||||||
|
golang 1.16+
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat May 1 13:46:23 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
- Update version to 5.13.10
|
||||||
|
* Disble bluetooth by default
|
||||||
|
* Disble calender service
|
||||||
|
* Fix save password on WIFI setting
|
||||||
|
* Update call power button on dde-lock
|
||||||
|
* Fix bluetooth connecting status
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Apr 25 13:59:32 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
- Fix build on Leap 15.3
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 12 13:14:57 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
Fri Mar 12 13:14:57 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
%define import_path pkg.deepin.io/dde/daemon
|
%define import_path pkg.deepin.io/dde/daemon
|
||||||
|
|
||||||
Name: deepin-daemon
|
Name: deepin-daemon
|
||||||
Version: 5.13.6
|
Version: 5.13.10
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Daemon handling the DDE session settings
|
Summary: Daemon handling the DDE session settings
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
@ -40,7 +40,9 @@ Patch1: %{name}-libinput.patch
|
|||||||
Patch2: disable-gobuild-in-makefile.patch
|
Patch2: disable-gobuild-in-makefile.patch
|
||||||
Patch3: xvfb-run.patch
|
Patch3: xvfb-run.patch
|
||||||
Group: System/GUI/Other
|
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-packaging
|
||||||
BuildRequires: deepin-gettext-tools
|
BuildRequires: deepin-gettext-tools
|
||||||
BuildRequires: fontpackages-devel
|
BuildRequires: fontpackages-devel
|
||||||
@ -70,7 +72,7 @@ BuildRequires: pkgconfig(xfixes)
|
|||||||
BuildRequires: pkgconfig(xkbfile)
|
BuildRequires: pkgconfig(xkbfile)
|
||||||
BuildRequires: golang-github-linuxdeepin-go-dbus-factory
|
BuildRequires: golang-github-linuxdeepin-go-dbus-factory
|
||||||
BuildRequires: golang-github-linuxdeepin-dde-api
|
BuildRequires: golang-github-linuxdeepin-dde-api
|
||||||
%if 0%{?suse_version} <= 1500
|
%if 0%{?sle_version} == 150200
|
||||||
BuildRequires: golang-github-stretchr-testify
|
BuildRequires: golang-github-stretchr-testify
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
|
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
|
||||||
@ -163,7 +165,7 @@ Provides translations for the "%{name}" package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -a2 -n %{_name}-%{version}
|
%autosetup -p1 -a2 -n %{_name}-%{version}
|
||||||
%if 0%{?suse_version} <= 1500
|
%if 0%{?sle_version} == 150200
|
||||||
rm -rf vendor/github.com/stretchr/testify/
|
rm -rf vendor/github.com/stretchr/testify/
|
||||||
%endif
|
%endif
|
||||||
mkdir -p $HOME/rpmbuild/BUILD/go/src/
|
mkdir -p $HOME/rpmbuild/BUILD/go/src/
|
||||||
@ -192,10 +194,10 @@ rm -rf $HOME/rpmbuild/BUILD/go/src/github.com \
|
|||||||
%goinstall
|
%goinstall
|
||||||
%gosrc
|
%gosrc
|
||||||
%make_install
|
%make_install
|
||||||
|
%gofilelist
|
||||||
pushd %{buildroot}%{_prefix}/lib/deepin-daemon
|
pushd %{buildroot}%{_prefix}/lib/deepin-daemon
|
||||||
ln -s ../../bin/* .
|
ln -s ../../bin/* .
|
||||||
popd
|
popd
|
||||||
%gofilelist
|
|
||||||
|
|
||||||
install -Dm644 %{SOURCE1} %{buildroot}%{_prefix}/lib/sysusers.d/deepin-daemon.conf
|
install -Dm644 %{SOURCE1} %{buildroot}%{_prefix}/lib/sysusers.d/deepin-daemon.conf
|
||||||
install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-dbus-installer
|
install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-dbus-installer
|
||||||
@ -329,3 +331,4 @@ fi
|
|||||||
%files lang -f %{_name}.lang
|
%files lang -f %{_name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user