删除mate-backgrounds.mo，解决与mate-backgrounds的冲突

0001-fix-conflict-remove-mate-backgrounds.mo.patch

@@ -0,0 +1,47 @@
+From ed75b9b3b410b7d99b6da910be0be365e2a1dccf Mon Sep 17 00:00:00 2001
+From: liuxinhao <liuxinhao@kylinsec.com.cn>
+Date: Tue, 28 Feb 2023 09:05:35 +0800
+Subject: [PATCH] fix(conflict):remove mate-backgrounds.mo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- 解决与mate-backgrounds的冲突
+---
+ mate-backgrounds.mo | Bin 1668 -> 0 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 mate-backgrounds.mo
+
+diff --git a/mate-backgrounds.mo b/mate-backgrounds.mo
+deleted file mode 100644
+index 2399911ff1c4dadf7e505f5899462ac709b941b3..0000000000000000000000000000000000000000
+GIT binary patch
+literal 0
+HcmV?d00001
+
+literal 1668
+zcmZXS`)eFk6vvOXKDt_K>#M%-;t$eLC%fCy7&k^tHjfsPHY6K^KS;URx!Ij&GqcXz
+z&7&YxnhMc?RcdO}jhaGhMVh9;JlZr3{vZen{sW@FxU;(;{-8e#e$VdIx_a1|&pl_)
+zJ<s`h*Vc~-@+_Wb@NB({s1E!MWI4SBHt<96Zg2*?7n}|3^WYBXmjZnSd=UCN$bR1i
+z`j6mF=s$rR?{{z;_-A1M3)}^L2a-GnJ`aY#Mv(pEAjdlh-UA*1?*scmj`Jq?FqjHB
+z4n6^WD$wUazPAK&yftt;xB*^4uit|le*#W8(g~3D$$;;J4?zDY`2W+uej(tO0T)58
+zXBFf)-vst=LGJH|fWLq|w?Bgaw;&n&Zwt5`<or7W?hg1I$Z=i>_;SFmfJZ@&<AV6n
+zXu!8YUg^_#c+Wgrj>A2%@XQ~ooQSXrx*rcptH`5x^X_<FEIdCJ-t+Ftsruq?h-c2i
+zz407acu!mt%OiN6s+@=(2YF{)=aYerTHeY@YH^d)nz3xtqqdx_s3YS@Ei79*qPr#0
+z&iWX2xXMclJ}Q?wrE4miI$fn~(XFHjhpLirrD<u)v1NujbD1o4NpnK9TCPbPOY~{i
+z$|_H^Nq4x`(q*O6nhranO?kuG$%<B)98S4T&Niu6TDE9&ovcTFR%V#`vaV&Ps82iY
+z2;P;Dlo)fw0L&is59Vy0s}wKdPR6V;R5JhDqZbuBGO4XmRpU4y5qv<7Dvt&n$D}t@
+z2HoEtL67SkQ%P+cGL6@j>!IUVHR0{@+wD=yb?gyk>rk)CI<7Xly_97dt+|wEB%GKC
+z^&CkUaaT#6m(eD*iiv%ZXrmF?Z$ukJ^gt{U-5ZHUB5*W%)u_c;{_7VN(T3Q*m-a>=
+zp)ToZ11qq-jKpkE5$2I}>=cG+iC2!Pp`k%(y(S$mSwB8;{M8pL`Ebon<zz}32_;8j
+zBA&Kv<ted;53)||No$?;V&U-E*jT;h=+=-LuTMH7;Sm%a*0|+`qx%muG=z_*kH!y&
+z>q6a!y4&vzCR!f}#T{E?7Di$si$1j)*Wqjidu<ZQv~)eCoBI<TM&lhnPBf%kquowA
+zCi;kp#z9N}Q*2CBa)o*_Iag+k4txq;OxW3q>NQ83MD^GlX$q0Qd7`wuN`;$WP;q&o
+zboB}q&)@X(=gD7QD4e=j*&LM?^Hg5Sm)^TZ#q|yU%q=RO`OMGXfc8P*)LL<UlS<QH
+zQDI@KIJrXp?Ag-PQg!G4+<fuIb@Er||7SY;xj#Q$p1V*wIqjdjO8&Xa<@^%;x;97t
+z$~2Wf`MP}a9SZK3HuL_>^_q{c@a`%?)|je^YfPnErwfadH70*{hA$R2u92U=%+;0G
+IC%Lu10p5A77ytkO
+
+-- 
+2.33.0
+

kiran-wallpapers.spec

@@ -1,6 +1,6 @@
 Name:		kiran-wallpapers
 Version:	0.8.1
-Release:	4
+Release:	5
 Summary:	Wallpapers for Kiran desktop
 
 License:	LGPL-2.0-or-later
@@ -10,6 +10,7 @@ Source0:	%{name}-%{version}.tar.gz
 Patch0001:	0001-Replace-the-default.jpg-file-of-the-default-wallpape.patch
 Patch1002:	0001-Remove-duplicate-wallpaper-sky.png-in-appearance-pre-52473ddd.patch
 Patch1003:	0002-Add-a-new-wallpaper-default.jpg-in-appearance-prefer-4ce03690.patch
+Patch1004:	0001-fix-conflict-remove-mate-backgrounds.mo.patch
 
 BuildRequires:  git
 
@@ -25,18 +26,18 @@ This package provides desktop wallpapers for kiran desktop
 git apply $RPM_SOURCE_DIR/0001-Replace-the-default.jpg-file-of-the-default-wallpape.patch
 %patch1002 -p1
 %patch1003 -p1
+git apply $RPM_SOURCE_DIR/0001-fix-conflict-remove-mate-backgrounds.mo.patch
 
 %build
 
 %install
 mkdir -p $RPM_BUILD_ROOT/usr/share/backgrounds/kiran/
 mkdir -p $RPM_BUILD_ROOT/usr/share/mate-background-properties/
-mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/
+
 cp -r $RPM_BUILD_DIR/%{name}-%{version}/kiran.xml $RPM_BUILD_ROOT/usr/share/backgrounds/
 cp -r $RPM_BUILD_DIR/%{name}-%{version}/*.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/kiran/
 cp -r $RPM_BUILD_DIR/%{name}-%{version}/*.png $RPM_BUILD_ROOT/usr/share/backgrounds/kiran/
 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 0%{?kylin}
 cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/default.jpg
@@ -48,9 +49,11 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/ba
 %doc
 %{_datadir}/backgrounds/
 %{_datadir}/mate-background-properties/
-%{_datadir}/locale/zh_CN/LC_MESSAGES/
 
 %changelog
+* Tue Feb 28 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 0.8.1-5
+- KYOS-F: remove mate-backgrounds.mo,conflict resolution
+
 * Mon Aug 08 2022 luoqing <luoqing@kylinsec.com.cn> - 0.8.1-4
 - KYOS-F: Modify license.