packages/kylin-usb-creator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize master branch, update to 1.1.2

Browse Source
This commit is contained in:
huayadong 2023-05-23 10:19:16 +08:00
parent d7e4371456
commit 2f9683974e
6 changed files with 93 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0001-fix-version-of-kylin-usb-creator.patch Normal file
View File

@ -0,0 +1,25 @@
From 348c4985246d76f762c3d9a96a3b961a53730518 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 22 Mar 2023 14:16:27 +0800
Subject: [PATCH] fix version of kylin-usb-creator
---
UIControl/src/include/menumodule.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/UIControl/src/include/menumodule.h b/UIControl/src/include/menumodule.h
index ca42c31..d9deeb2 100644
--- a/UIControl/src/include/menumodule.h
+++ b/UIControl/src/include/menumodule.h
@@ -56,7 +56,7 @@ public:
public:
// 程序在实例化的时候需要传递的信息字段,打开debug开关后这些字段会被自动填充
QString appName = "tools/kylin-usb-creator"; //格式kylin-usb-creator
- QString appVersion = "1.1.0";
+ QString appVersion = "1.1.2";
QString appDesc = "appDesc字段未填充!";
QString iconPath = ":/data/kylin-usb-creator.svg";
QString confPath = "org.kylin-usb-creator-data.settings";
--
2.39.1

42
0002-add-kylin-user-guide-of-kylin-usb-creator.patch Normal file
View 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.2";
QString appDesc = "appDesc字段未填充!";
QString iconPath = ":/data/kylin-usb-creator.svg";
--
2.39.1

BIN
kylin-usb-creator-1.1.1.tar.gz
View File

Binary file not shown.

BIN
kylin-usb-creator-1.1.2.tar.gz Normal file
View File

Binary file not shown.

27
kylin-usb-creator.spec
View File

@ -1,11 +1,12 @@
%define debug_package %{nil}
Name: kylin-usb-creator
Version: 1.1.1
Version: 1.1.2
Release: 1
Summary: kylin-usb-creator
License: GPL-3+
URL: http://www.ukui.org
Source0: %{name}-%{version}.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
@ -16,14 +17,16 @@ BuildRequires: gsettings-qt-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: polkit-qt5-1-devel
BuildRequires: ukui-interface
# Requires: NetworkManager
%description
kylin-usb-creator
%prep
%setup -q
%patch01 -p1
%patch02 -p1
%build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-usb-creator.pro
@ -53,13 +56,31 @@ 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
* Mon May 08 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.2-1
- update to upstream version 1.1.2
* 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
* Tue Feb 07 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.1-2
- add build debuginfo and debugsource
* Wed Mar 16 2022 tanyulong <tanyulong@kylinos.cn> - 1.1.1-1
- update to upstream version 1.1.1
* Fri Dec 10 2021 douyan <douyan@kylinos.cn> - 1.0.0-3
- fix min window logic
* Wed Dec 8 2021 douyan <douyan@kylinos.cn> - 1.0.0-2
- add dbus service
* Tue Dec 15 2020 lvhan <lvhan@kylinos.cn> - 1.0.0-1
- update to upstream version 1.0.0-26kord

4
kylin-usb-creator.yaml
View File

@ -1,4 +1,4 @@
version_control: github
src_repo: UbuntuKylin/kylin-usb-creator
tag_prefix: "kylin-usb-creator-"
seperator: "."
tag_prefix: "^v"
separator: "."