diff --git a/dde-daemon-5.12.0.18.orig.tar.xz b/dde-daemon-5.12.0.18.orig.tar.xz deleted file mode 100644 index 83e6f98b7179fe153d4f8c8ccfc83856f2d0c7a2..0000000000000000000000000000000000000000 Binary files a/dde-daemon-5.12.0.18.orig.tar.xz and /dev/null differ diff --git a/dde-daemon-5.13.16.11.orig.tar.xz b/dde-daemon-5.13.16.11.orig.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3e871a8d3125d3248b02a73270312aef7729df48 Binary files /dev/null and b/dde-daemon-5.13.16.11.orig.tar.xz differ diff --git a/dde-daemon.spec b/dde-daemon.spec index 34b49792f438ead08c9f1ac77776bd960c9eec3f..7d9043dc88f59338d74d93a099e1f697120fbfd6 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -11,16 +11,15 @@ %global release_name server-industry Name: dde-daemon -Version: 5.12.0.18 -Release: 5 +Version: 5.13.16.11 +Release: 2 Summary: Daemon handling the DDE session settings License: GPLv3 URL: http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/ Source0: %{name}-%{version}.orig.tar.xz -Source1: vendor.tar.gz +Source1: vendor.tar.gz Source2: %{sname}.sysusers - BuildRequires: python3 BuildRequires: golang BuildRequires: deepin-gettext-tools @@ -44,11 +43,12 @@ BuildRequires: libinput BuildRequires: librsvg2-devel BuildRequires: librsvg2 BuildRequires: libXcursor-devel +BuildRequires: libddcutil-devel BuildRequires: pkgconfig(sqlite3) +BuildRequires: dde-api-devel Requires: bluez-libs Requires: deepin-desktop-base -Suggests: deepin-desktop-server Requires: deepin-desktop-schemas Requires: dde-session-ui Requires: dde-polkit-agent @@ -110,17 +110,18 @@ EOF # Replace reference of google-chrome to chromium-browser sed -i 's/google-chrome/chromium-browser/g' misc/dde-daemon/mime/data.json -go env -w GO111MODULE=auto %build +go env -w GO111MODULE=auto +export GOPATH=%{_builddir}/%{name}-%{version}/vendor:$GOPATH + BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -export GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor %make_build GO_BUILD_FLAGS=-trimpath GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\"" - +#make GOPATH=/usr/share/gocode %install BUILDID="0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -export GOPATH=/usr/share/gocode +export GOPATH=%{_builddir}/%{name}-%{version}/vendor:$GOPATH %make_install PAM_MODULE_DIR=%{_libdir}/security GOBUILD="go build -compiler gc -ldflags \"-B $BUILDID\"" install -Dm644 %{SOURCE2} %{buildroot}/usr/lib/sysusers.d/%{sname}.conf @@ -169,25 +170,25 @@ fi %{_datadir}/%{name}/ %{_datadir}/dde/ %{_datadir}/polkit-1/actions/*.policy -%{_var}/cache/appearance/ %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla %{_sysconfdir}/acpi/actions/deepin_lid.sh %{_sysconfdir}/acpi/events/deepin_lid %{_sysconfdir}/pulse/daemon.conf.d/10-deepin.conf /lib/udev/rules.d/80-deepin-fprintd.rules -%{_datadir}/pam-configs/deepin-auth /var/lib/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Fprintd.pkla -%{_libdir}/security/pam_deepin_auth.so /lib/systemd/system/dbus-com.deepin.dde.lockservice.service /lib/systemd/system/deepin-accounts-daemon.service %{_sysusersdir}/%{sname}.conf %changelog -* Tue Mar 08 2022 liweigang - 5.12.0.18-5 -- fix install warning +* Tue Aug 02 2022 liweiganga - 5.13.16.11-2 +- fix install + +* Mon Jul 18 2022 konglidong - 5.13.16.11-1 +- Update to 5.13.16.11 -* Thu Feb 10 2022 liweigang - 5.12.0.18-4 +* Sat Jan 29 2022 liweigang - 5.12.0.18-4 - fix build error and format spec. * Thu Aug 26 2021 heyitao - 5.12.0.18-3 diff --git a/vendor.tar.gz b/vendor.tar.gz index 3004da3ff6b9871736cc02f5038e07c00eff536c..a8ffb6247ce1b28f70c3c8289a010ea99a356d9b 100644 Binary files a/vendor.tar.gz and b/vendor.tar.gz differ