!8 fix build error in openeuler

From: @kylinsecos_admin 
Reviewed-by: @doudou19 
Signed-off-by: @doudou19
This commit is contained in:
openeuler-ci-bot 2022-02-22 07:42:13 +00:00 committed by Gitee
commit fd39b79d3c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,6 +1,6 @@
Name: kiran-wallpapers Name: kiran-wallpapers
Version: 0.8.1 Version: 0.8.1
Release: 1%{?dist}.kb12 Release: 2%{?dist}
Summary: Wallpapers for Kiran desktop Summary: Wallpapers for Kiran desktop
License: LGPLv2+ License: LGPLv2+
@ -16,9 +16,6 @@ BuildRequires: git
Conflicts: kiran-themes < 0.8.1 Conflicts: kiran-themes < 0.8.1
BuildArch: noarch BuildArch: noarch
#由于/usr/share/background/default.jpg与openEluer-logo冲突,特殊处理
%define BuildForOpenEluer true
%description %description
This package provides desktop wallpapers for kiran desktop This package provides desktop wallpapers for kiran desktop
@ -41,10 +38,10 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/*.png $RPM_BUILD_ROOT/usr/share/backgrou
cp -r $RPM_BUILD_DIR/%{name}-%{version}/kiran_background.xml $RPM_BUILD_ROOT/usr/share/mate-background-properties/ cp -r $RPM_BUILD_DIR/%{name}-%{version}/kiran_background.xml $RPM_BUILD_ROOT/usr/share/mate-background-properties/
cp -r $RPM_BUILD_DIR/%{name}-%{version}/mate-backgrounds.mo $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/ cp -r $RPM_BUILD_DIR/%{name}-%{version}/mate-backgrounds.mo $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/
%if %{BuildForOpenEluer}==true %if 0%{?kylin}
cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/default_kiran.jpg
%else
cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/default.jpg cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/default.jpg
%else
cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/default_kiran.jpg
%endif %endif
%files %files
@ -54,6 +51,9 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/ba
%{_datadir}/locale/zh_CN/LC_MESSAGES/ %{_datadir}/locale/zh_CN/LC_MESSAGES/
%changelog %changelog
* Tue Feb 22 2022 longcheng <longcheng@kylinos.com.cn> - 0.8.1-2
- KYOS-B: fix build error in openeuler
* Thu Oct 28 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 0.8.1-1.kb12 * Thu Oct 28 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 0.8.1-1.kb12
- KYOS-R: Rename default.jpg to default_ kiran.jpg(#45551) - KYOS-R: Rename default.jpg to default_ kiran.jpg(#45551)