46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
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
|
|
|