!3 Fix the problem that the picture default.jpg is conflicted with openeuler package.
From: @tangjie02 Reviewed-by: @doudou19 Signed-off-by: @doudou19
This commit is contained in:
openeuler-ci-bot
Gitee
commit
78949cb1cf
@ -0,0 +1,30 @@
|
||||
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
|
||||
|
||||
26042
0001-Replace-the-default.jpg-file-of-the-default-wallpape.patch
Normal file
26042
0001-Replace-the-default.jpg-file-of-the-default-wallpape.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,28 @@
|
||||
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
|
||||
|
||||
@ -1,15 +1,23 @@
|
||||
Name: kiran-wallpapers
|
||||
Version: 0.8.1
|
||||
Release: 1%{?dist}.kb8
|
||||
Release: 1%{?dist}.kb12
|
||||
Summary: Wallpapers for Kiran desktop
|
||||
|
||||
License: LGPLv2+
|
||||
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
|
||||
|
||||
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
|
||||
@ -17,6 +25,9 @@ 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
|
||||
|
||||
%build
|
||||
|
||||
@ -29,8 +40,12 @@ 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/
|
||||
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}/default.jpg $RPM_BUILD_ROOT/usr/share/backgrounds/
|
||||
|
||||
%if %{BuildForOpenEluer}==true
|
||||
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
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc
|
||||
@ -39,7 +54,20 @@ cp -r $RPM_BUILD_DIR/%{name}-%{version}/default.jpg $RPM_BUILD_ROOT/usr/share/ba
|
||||
%{_datadir}/locale/zh_CN/LC_MESSAGES/
|
||||
|
||||
%changelog
|
||||
* Mon Nov 10 2020 ouyangminxiang <ouyangminxiang@kylinos.com.cn> - 0.8.1-1.ky3.kb8
|
||||
* Thu Oct 28 2021 liuxinhao <liuxinhao@kylinos.com.cn> - 0.8.1-1.kb12
|
||||
- KYOS-R: Rename default.jpg to default_ kiran.jpg(#45551)
|
||||
|
||||
* Thu Jul 15 2021 longcheng <longcheng@kylinos.com.cn> - 0.8.1-1.kb11
|
||||
- KYOS-P: Remove duplicate wallpaper sky.png in appearance preferences (#41117)
|
||||
- KYOS-P: Add a new wallpaper default.jpg in appearance preferences (#41117)
|
||||
|
||||
* Tue May 25 2021 caoyuanji<caoyuanji@kylinos.com.cn> - 0.8.1-1.kb10
|
||||
- KYOS-P: Replace the default.jpg file of the default wallpaper .(Related: #39030)
|
||||
|
||||
* 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
|
||||
- KYOS-P: add some wallpaper pictures
|
||||
- Related: #31702
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user