diff --git a/kiran-wallpapers.spec b/kiran-wallpapers.spec index 69ecfd8..d04616c 100644 --- a/kiran-wallpapers.spec +++ b/kiran-wallpapers.spec @@ -1,6 +1,6 @@ Name: kiran-wallpapers Version: 0.8.1 -Release: 1%{?dist}.kb12 +Release: 2%{?dist} Summary: Wallpapers for Kiran desktop License: LGPLv2+ @@ -16,9 +16,6 @@ BuildRequires: git Conflicts: kiran-themes < 0.8.1 BuildArch: noarch -#由于/usr/share/background/default.jpg与openEluer-logo冲突,特殊处理 -%define BuildForOpenEluer true - %description 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}/mate-backgrounds.mo $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/ -%if %{BuildForOpenEluer}==true -cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/default_kiran.jpg -%else +%if 0%{?kylin} 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 %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/ %changelog +* Tue Feb 22 2022 longcheng - 0.8.1-2 +- KYOS-B: fix build error in openeuler + * Thu Oct 28 2021 liuxinhao - 0.8.1-1.kb12 - KYOS-R: Rename default.jpg to default_ kiran.jpg(#45551)