update version to 1.0.4
This commit is contained in:
parent
a075bce175
commit
14f18d235d
27
0001-modify-compile-error-of-None.patch
Normal file
27
0001-modify-compile-error-of-None.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 62908f315fbc92fbebc930992cf186dcdb3bf550 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Wed, 1 Jun 2022 17:18:15 +0800
|
||||
Subject: [PATCH] modify compile error of None
|
||||
|
||||
---
|
||||
src/guide-widget.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/guide-widget.cpp b/src/guide-widget.cpp
|
||||
index 8441a13..58b8d47 100644
|
||||
--- a/src/guide-widget.cpp
|
||||
+++ b/src/guide-widget.cpp
|
||||
@@ -30,9 +30,9 @@
|
||||
#include <QList>
|
||||
#include <QSysInfo>
|
||||
#include <QX11Info>
|
||||
+#include "guide-widget.h"
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
-#include "guide-widget.h"
|
||||
#include "common-tool/comm_func.h"
|
||||
#include "xatom-helper.h"
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
kylin-user-guide-1.0.4.tar.gz
Normal file
BIN
kylin-user-guide-1.0.4.tar.gz
Normal file
Binary file not shown.
@ -1,12 +1,12 @@
|
||||
%define debug_package %{nil}
|
||||
Name: kylin-user-guide
|
||||
Version: 1.0.0
|
||||
Release: 3
|
||||
Summary: A component of the ukui desktop environment that provides convenient text
|
||||
License: GPL-3.0-or-later
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
Name: kylin-user-guide
|
||||
Version: 1.0.4
|
||||
Release: 1
|
||||
Summary: A component of the ukui desktop environment that provides convenient text
|
||||
License: CC-BY-SA-4.0 and GPL-3.0-or-later
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch01: 0001-modify-compile-error-of-None.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
@ -17,11 +17,13 @@ BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: qt5-qtwebkit-devel
|
||||
BuildRequires: pkgconf
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: ukui-interface
|
||||
|
||||
|
||||
Requires: js-jquery
|
||||
Requires: nodejs-requirejs
|
||||
Requires: kylin-user-guide-common
|
||||
Requires: js-jquery
|
||||
Requires: nodejs-requirejs
|
||||
#Requires: js-marked
|
||||
Requires: kylin-user-guide-common
|
||||
|
||||
|
||||
%description
|
||||
@ -37,6 +39,7 @@ this packages contains the picture of application
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
mkdir build && cd build
|
||||
@ -49,13 +52,16 @@ cd %{_builddir}/%{name}-%{version}/build
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
mkdir -p %{buildroot}/usr/share/kylin-user-guide/web
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/web/*.html %{buildroot}/usr/share/kylin-user-guide/web
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/web/* %{buildroot}/usr/share/kylin-user-guide/web
|
||||
|
||||
mkdir -p %{buildroot}/etc/xdg/autostart/
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/data/kylin-user-guide.desktop %{buildroot}/etc/xdg/autostart/
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/data/kylin-user-guide-daemon.desktop %{buildroot}/etc/xdg/autostart/
|
||||
|
||||
mkdir -p %{buildroot}/usr/share/applications
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/data/kylin-user-guide.desktop %{buildroot}/usr/share/applications
|
||||
|
||||
mkdir -p %{buildroot}/usr/share/kylin-user-guide/data
|
||||
cp -r %{_builddir}/%{name}-%{version}/data/*png %{buildroot}/usr/share/kylin-user-guide/data
|
||||
cp -r %{_builddir}/%{name}-%{version}/data/ %{buildroot}/usr/share/kylin-user-guide/
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
@ -66,12 +72,17 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/32x32/apps/kylin-user-guide.png
|
||||
%{_datadir}/icons/hicolor/56x56/apps/kylin-user-guide.png
|
||||
%{_datadir}/kylin-user-guide/web/*
|
||||
%{_sysconfdir}/xdg/autostart/kylin-user-guide.desktop
|
||||
%{_datadir}/applications/kylin-user-guide.desktop
|
||||
%{_sysconfdir}/xdg/autostart/kylin-user-guide-daemon.desktop
|
||||
|
||||
%files common
|
||||
%{_datadir}/kylin-user-guide/translations/*.qm
|
||||
%{_datadir}/kylin-user-guide/data/*
|
||||
|
||||
%changelog
|
||||
* Wed Jun 1 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-1
|
||||
- update version to 1.0.4
|
||||
|
||||
* Wed May 18 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.0-3
|
||||
- Improve the project according to the requirements of compliance improvement
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user