From e172fadf98996c0ccfc15fc5dfce23767a0a1262 Mon Sep 17 00:00:00 2001 From: huayadong Date: Fri, 16 Jun 2023 16:41:26 +0800 Subject: [PATCH] fix_install_the_repair_file_in_the_bin_directory (cherry picked from commit 650945f10d0ad5c653aa24229dfd39c7b7f27a38) --- ...the_repair_file_in_the_bin_directory.patch | 40 +++++++++++++++++++ kylin-music.spec | 8 +++- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch diff --git a/kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch b/kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch new file mode 100644 index 0000000..d5dbf35 --- /dev/null +++ b/kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch @@ -0,0 +1,40 @@ +From ecdfd545096035a7092205d9f8a743d7185183ac Mon Sep 17 00:00:00 2001 +From: huayadong +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 + diff --git a/kylin-music.spec b/kylin-music.spec index 2a5a204..a9ba069 100644 --- a/kylin-music.spec +++ b/kylin-music.spec @@ -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 - 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 - 1.1.3-2 - add build debuginfo and debugsource