!11 add kylin-user-guide of kylin-usb-creator
From: @peijiankang Reviewed-by: @hua_yadong Signed-off-by: @hua_yadong
This commit is contained in:
commit
314f8b4f54
42
0002-add-kylin-user-guide-of-kylin-usb-creator.patch
Normal file
42
0002-add-kylin-user-guide-of-kylin-usb-creator.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From 6348fc1739588941cf8159560011792b0159c54d Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Wed, 22 Mar 2023 14:56:36 +0800
|
||||
Subject: [PATCH] add kylin-user-guide of kylin-usb-creator
|
||||
|
||||
---
|
||||
UIControl/UIControl.pro | 5 ++++-
|
||||
UIControl/src/include/menumodule.h | 2 +-
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/UIControl/UIControl.pro b/UIControl/UIControl.pro
|
||||
index 1f9cdde..dfe69b0 100644
|
||||
--- a/UIControl/UIControl.pro
|
||||
+++ b/UIControl/UIControl.pro
|
||||
@@ -62,7 +62,10 @@ schemes.path = /usr/share/glib-2.0/schemas/
|
||||
desktop.path = /usr/share/applications
|
||||
desktop.files = kylin-usb-creator.desktop
|
||||
|
||||
-INSTALLS += target desktop icons schemes
|
||||
+userM.path = /usr/share/kylin-user-guide/data/guide/kylin-usb-creator/
|
||||
+userM.files += ../userM/*
|
||||
+
|
||||
+INSTALLS += target desktop icons schemes userM
|
||||
CONFIG += link_pkgconfig
|
||||
|
||||
PKGCONFIG += gsettings-qt
|
||||
diff --git a/UIControl/src/include/menumodule.h b/UIControl/src/include/menumodule.h
|
||||
index d9deeb2..3eeefb6 100644
|
||||
--- a/UIControl/src/include/menumodule.h
|
||||
+++ b/UIControl/src/include/menumodule.h
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
|
||||
public:
|
||||
// 程序在实例化的时候需要传递的信息字段,打开debug开关后这些字段会被自动填充
|
||||
- QString appName = "tools/kylin-usb-creator"; //格式kylin-usb-creator
|
||||
+ QString appName = "kylin-usb-creator"; //格式kylin-usb-creator
|
||||
QString appVersion = "1.1.1";
|
||||
QString appDesc = "appDesc字段未填充!";
|
||||
QString iconPath = ":/data/kylin-usb-creator.svg";
|
||||
--
|
||||
2.39.1
|
||||
|
||||
BIN
kylin-usb-creator-userM.tar.gz
Normal file
BIN
kylin-usb-creator-userM.tar.gz
Normal file
Binary file not shown.
@ -1,11 +1,13 @@
|
||||
Name: kylin-usb-creator
|
||||
Version: 1.1.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
Summary: kylin-usb-creator
|
||||
License: GPL-3+
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source1: %{name}-userM.tar.gz
|
||||
Patch01: 0001-fix-version-of-kylin-usb-creator.patch
|
||||
Patch02: 0002-add-kylin-user-guide-of-kylin-usb-creator.patch
|
||||
|
||||
BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: qt5-qtscript-devel
|
||||
@ -23,7 +25,9 @@ BuildRequires: polkit-qt5-1-devel
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -T -D -q -b 1
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
|
||||
%build
|
||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-usb-creator.pro
|
||||
@ -53,11 +57,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/dbus-1/system-services/com.kylinusbcreator.systemdbus.service
|
||||
%{_datadir}/glib-2.0/schemas/org.kylin-usb-creator-data.gschema.xml
|
||||
%{_datadir}/polkit-1/actions/com.kylinusbcreator.systemdbus.policy
|
||||
%{_datadir}/kylin-user-guide/data/guide/kylin-usb-creator
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Mar 22 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.1-4
|
||||
- add kylin-user-guide of kylin-usb-creator
|
||||
|
||||
* Wed Mar 22 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.1-3
|
||||
- fix version of kylin-usb-creator
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user