From 92ccf0696f98a179423fdd5a2b6c99bf3090c61c Mon Sep 17 00:00:00 2001 From: weidong Date: Thu, 3 Sep 2020 11:48:25 +0800 Subject: [PATCH 1/2] fix source url in spec --- dde-session-shell.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dde-session-shell.spec b/dde-session-shell.spec index 9c54ce5..bd30809 100644 --- a/dde-session-shell.spec +++ b/dde-session-shell.spec @@ -4,11 +4,11 @@ Name: dde-session-shell Version: 5.0.0.8 -Release: 1 +Release: 2 Summary: deepin-session-shell - Deepin desktop-environment - session-shell module License: GPLv3+ URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/dde-session-shell/ -Source0: %{name}_%{version}.orig.tar.xz +Source0: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz BuildRequires: cmake BuildRequires: dde-daemon @@ -61,5 +61,8 @@ make %{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service %changelog +* Thu Sep 3 2020 weidong - 5.0.0.8-2 +- fix source url in spec + * Thu Jul 30 2020 openEuler Buildteam - 5.0.0.8-1 - Package init From 70337b38ae3a696f58a759f26b410dd740fc3244 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 4 Sep 2020 13:42:57 +0800 Subject: [PATCH 2/2] fix conflict --- dde-session-shell.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dde-session-shell.spec b/dde-session-shell.spec index cda4768..31192ca 100644 --- a/dde-session-shell.spec +++ b/dde-session-shell.spec @@ -61,7 +61,6 @@ make %{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service %changelog -<<<<<<< HEAD * Fri Sep 04 2020 weidong - 5.0.0.8-3 - fix source url in spec