!2 fix-screenshot-service
From: @myshow2258 Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
761d4e666e
45
0001-fix-screenshot-service.patch
Normal file
45
0001-fix-screenshot-service.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 104239c8a8ad8e53377a6c06c574719eb788290f Mon Sep 17 00:00:00 2001
|
||||
From: lvhan <lvhan@kylinos.cn>
|
||||
Date: Thu, 14 Jan 2021 16:25:26 +0800
|
||||
Subject: [PATCH] fix-screenshot-service
|
||||
|
||||
---
|
||||
kylin-screenshot.pro | 11 ++++++-----
|
||||
openEuler/build_install.sh | 2 +-
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/kylin-screenshot.pro b/kylin-screenshot.pro
|
||||
index f216f23..70fd2cb 100644
|
||||
--- a/kylin-screenshot.pro
|
||||
+++ b/kylin-screenshot.pro
|
||||
@@ -315,11 +315,12 @@ unix:!macx {
|
||||
|
||||
servicedbus.path = $${PREFIX}/share/dbus-1/services/
|
||||
|
||||
- packaging {
|
||||
- servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
- } else {
|
||||
- servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service
|
||||
- }
|
||||
+# packaging {
|
||||
+# servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
+# } else {
|
||||
+# servicedbus.files = dbus/make/org.dharkael.kylinscreenshot.service
|
||||
+# }
|
||||
+ servicedbus.files = dbus/package/org.dharkael.kylinscreenshot.service
|
||||
|
||||
INSTALLS += target \
|
||||
icon \
|
||||
diff --git a/openEuler/build_install.sh b/openEuler/build_install.sh
|
||||
index 46643ff..06455e8 100644
|
||||
--- a/openEuler/build_install.sh
|
||||
+++ b/openEuler/build_install.sh
|
||||
@@ -21,4 +21,4 @@ cd /root/rpmbuild/SPECS/
|
||||
rpmbuild -ba $pkg_name.spec
|
||||
echo "安装rpm包"
|
||||
cd /root/rpmbuild/RPMS/x86_64/
|
||||
-rpm -ivh --replacefiles --force --nodeps *.x86_64.rpm
|
||||
+rpm -Uvh --replacefiles --force --nodeps $pkg_name*.x86_64.rpm
|
||||
--
|
||||
2.29.2.windows.2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
%define debug_package %{nil}
|
||||
Name: kylin-screenshot
|
||||
Version: 1.0.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: a powerful screenshot and screen recording tool
|
||||
License: GPL-3+
|
||||
URL: https://github.com/ubuntukylin
|
||||
@ -26,6 +26,8 @@ BuildRequires: gsettings-qt-devel
|
||||
|
||||
# Requires: NetworkManager
|
||||
|
||||
patch0: 0001-fix-screenshot-service.patch
|
||||
|
||||
%description
|
||||
Powerful yet simple-to-use screenshot software
|
||||
kylin-screenshot is a powerful screenshot and screen recording tool.
|
||||
@ -36,6 +38,7 @@ BuildRequires: gsettings-qt-devel
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-screenshot.pro
|
||||
@ -86,5 +89,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/metainfo/kylinscreenshot.appdata.xml
|
||||
|
||||
%changelog
|
||||
* Thu Jan 14 2021 lvhan <lvhan@kylinos.cn> - 1.0.0-2
|
||||
- fix-screenshot-service
|
||||
|
||||
* Tue Dec 15 2020 lvhan <lvhan@kylinos.cn> - 1.0.0-1
|
||||
- update to upstream version 1.0.0-1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user