Fix SPEC file syntax error
Signed-off-by: wangyucheng <wangyucheng@kylinsec.com.cn>
This commit is contained in:
wangyucheng
yuanxing
parent
7a0c54ff0c
commit
d4c6c8a01f
@ -1,30 +0,0 @@
|
||||
From 52473ddd519ca1f654eda16fe3ed18f3f9862d22 Mon Sep 17 00:00:00 2001
|
||||
From: longcheng <longcheng@kylinos.com.cn>
|
||||
Date: Wed, 14 Jul 2021 15:56:52 +0800
|
||||
Subject: [PATCH 1/2] Remove duplicate wallpaper sky.png in appearance
|
||||
preferences
|
||||
|
||||
---
|
||||
kiran_background.xml | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/kiran_background.xml b/kiran_background.xml
|
||||
index 08f6be3..9f0ccd8 100644
|
||||
--- a/kiran_background.xml
|
||||
+++ b/kiran_background.xml
|
||||
@@ -43,12 +43,6 @@
|
||||
<filename>/usr/share/backgrounds/kiran/Earth.jpg</filename>
|
||||
<options>zoom</options>
|
||||
</wallpaper>
|
||||
- <wallpaper deleted="false">
|
||||
- <name>Sky</name>
|
||||
- <name xml:lang="zh_CN">星球</name>
|
||||
- <filename>/usr/share/backgrounds/kiran/Sky.png</filename>
|
||||
- <options>zoom</options>
|
||||
- </wallpaper>
|
||||
<wallpaper deleted="false">
|
||||
<name>Desert</name>
|
||||
<name xml:lang="zh_CN">沙漠</name>
|
||||
--
|
||||
2.27.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,47 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 4ce03690e9eaa4d73770a4258c4eb1f3aa41dc90 Mon Sep 17 00:00:00 2001
|
||||
From: longcheng <longcheng@kylinos.com.cn>
|
||||
Date: Wed, 14 Jul 2021 15:59:51 +0800
|
||||
Subject: [PATCH 2/2] Add a new wallpaper default.jpg in appearance preferences
|
||||
|
||||
---
|
||||
kiran_background.xml | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/kiran_background.xml b/kiran_background.xml
|
||||
index 9f0ccd8..09d28b9 100644
|
||||
--- a/kiran_background.xml
|
||||
+++ b/kiran_background.xml
|
||||
@@ -91,5 +91,11 @@
|
||||
<filename>/usr/share/backgrounds/kiran/default.jpg</filename>
|
||||
<options>zoom</options>
|
||||
</wallpaper>
|
||||
+ <wallpaper deleted="false">
|
||||
+ <name>Earth</name>
|
||||
+ <name xml:lang="zh_CN">默认1</name>
|
||||
+ <filename>/usr/share/backgrounds/kiran/default1.jpg</filename>
|
||||
+ <options>zoom</options>
|
||||
+ </wallpaper>
|
||||
</wallpapers>
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Binary file not shown.
@ -1,17 +1,12 @@
|
||||
Name: kiran-wallpapers
|
||||
Version: 0.8.1
|
||||
Release: 5
|
||||
Version: 2.3.0
|
||||
Release: 1
|
||||
Summary: Wallpapers for Kiran desktop
|
||||
|
||||
License: LGPL-2.0-or-later
|
||||
URL: http://www.kylinsec.com.cn
|
||||
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
|
||||
|
||||
Conflicts: kiran-themes < 0.8.1
|
||||
@ -23,10 +18,6 @@ This package provides desktop wallpapers for kiran desktop
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
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
|
||||
|
||||
@ -39,7 +30,7 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/*.jpg $RPM_BUILD_ROOT/usr/share/backgrou
|
||||
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/
|
||||
|
||||
%if 0%{?kylin}
|
||||
%if "%{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
|
||||
@ -51,6 +42,9 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/ba
|
||||
%{_datadir}/mate-background-properties/
|
||||
|
||||
%changelog
|
||||
* Tue Apr 11 2023 wangyucheng <wangyucheng@kylinsec.com.cn> - 2.3.0-1
|
||||
- KYOS-F: Fix SPEC file syntax error & fix fake date
|
||||
|
||||
* Tue Feb 28 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 0.8.1-5
|
||||
- KYOS-F: remove mate-backgrounds.mo,conflict resolution
|
||||
|
||||
@ -76,7 +70,7 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/ba
|
||||
* Mon May 10 2021 kpkg <kpkg@kylinos.com.cn> - 0.8.1-1.kb9
|
||||
- rebuild for KY3.4-4
|
||||
|
||||
* Wed Nov 10 2020 ouyangminxiang <ouyangminxiang@kylinos.com.cn> - 0.8.1-1.ky3.kb8
|
||||
* Tue Nov 10 2020 ouyangminxiang <ouyangminxiang@kylinos.com.cn> - 0.8.1-1.ky3.kb8
|
||||
- KYOS-P: add some wallpaper pictures
|
||||
- Related: #31702
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user