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

fix_install_the_repair_file_in_the_bin_directory

Browse Source 
(cherry picked from commit 650945f10d0ad5c653aa24229dfd39c7b7f27a38)
This commit is contained in:
huayadong 2023-06-16 16:41:26 +08:00 committed by openeuler-sync-bot
parent 30a7e1ee78
commit e172fadf98
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch Normal file
View File

@ -0,0 +1,40 @@
From ecdfd545096035a7092205d9f8a743d7185183ac Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Fri, 16 Jun 2023 16:11:25 +0800
Subject: [PATCH]
kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch
---
kylin-music-plugins-simple/src/CMakeLists.txt | 2 +-
kylin-music.pro | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kylin-music-plugins-simple/src/CMakeLists.txt b/kylin-music-plugins-simple/src/CMakeLists.txt
index 9ea83c9..0a7a126 100644
--- a/kylin-music-plugins-simple/src/CMakeLists.txt
+++ b/kylin-music-plugins-simple/src/CMakeLists.txt
@@ -18,7 +18,7 @@ set(SOURCE_FILES
if(SIMPLE_WITH_JIEBA)
include_directories(${SQLITE3_HEADERS_DIR} ${source_dir}/include ${source_dir}/deps)
- INSTALL(DIRECTORY ${source_dir}/dict/ DESTINATION bin/dict FILES_MATCHING PATTERN "*.utf8")
+ INSTALL(DIRECTORY ${source_dir}/dict/ DESTINATION share/kylin-music/dict FILES_MATCHING PATTERN "*.utf8")
else()
include_directories(${SQLITE3_HEADERS_DIR})
endif()
diff --git a/kylin-music.pro b/kylin-music.pro
index 0cfa118..bbb1af7 100644
--- a/kylin-music.pro
+++ b/kylin-music.pro
@@ -36,7 +36,7 @@ simple.files = $$PWD/kylin-music-plugins-simple/build/src/libsimple.so
simple.path = /usr/share/kylin-music
dict.files +=$$PWD/kylin-music-plugins-simple/build/cppjieba/dict
-dict.path = /usr/bin/
+dict.path = /usr/share/kylin-music
qm_files.files = translations/*.qm
qm_files.path = /usr/share/kylin-music/translations/
--
2.36.1

8
kylin-music.spec
View File

@ -1,6 +1,6 @@
Name: kylin-music
Version: 1.1.3
Release: 2
Release: 3
Summary: kylin-music
License: GPL-3.0-or-later and MIT
URL: https://github.com/UbuntuKylin/kylin-music
@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz
patch0: 0001-fix-compile-error-of-kylin-music.patch
patch1: 0002-modify-version-is-error.patch
Patch2: kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qtchooser
@ -32,6 +33,7 @@ kylin-music
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
export PATH=%{_qt5_bindir}:$PATH
@ -64,7 +66,6 @@ popd
mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide
cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/kylin-user-guide/data/guide/
%files
%doc debian/changelog
%license debian/copyright
@ -77,6 +78,9 @@ cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/ky
%{_datadir}/kylin-user-guide/data/guide/*
%changelog
* Wed Jun 14 2023 huayadong <huayadong@kylinos.cn> - 1.1.3-3
- add Patch2：kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch
* Wed Feb 1 2023 peijiankang <peijiankang@kylinos.cn> - 1.1.3-2
- add build debuginfo and debugsource