packages/kiran-wallpapers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!23 update to 2.3.0-4

Browse Source 
From: @yuan__xing 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
This commit is contained in:
openeuler-ci-bot 2023-05-12 09:50:35 +00:00 committed by Gitee
commit 3a014e9f53
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 18 additions and 26112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Remove-duplicate-wallpaper-sky.png-in-appearance-pre-52473ddd.patch
View File

@ -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

26042
0001-Replace-the-default.jpg-file-of-the-default-wallpape.patch
View File

File diff suppressed because it is too large Load Diff

28
0002-Add-a-new-wallpaper-default.jpg-in-appearance-prefer-4ce03690.patch
View File

@ -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

BIN
kiran-wallpapers-0.8.1.tar.gz → kiran-wallpapers-2.3.0.tar.gz
View File

Binary file not shown.

30
kiran-wallpapers.spec
View File

@ -1,5 +1,5 @@
Name: kiran-wallpapers
Version: 0.8.1
Version: 2.3.0
Release: 4
Summary: Wallpapers for Kiran desktop
@ -7,10 +7,6 @@ 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
BuildRequires: git
Conflicts: kiran-themes < 0.8.1
@ -22,21 +18,17 @@ 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
%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 +40,23 @@ 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
* Fri May 12 2023 yuanxing <yuanxing@kylinsec.com.cn> - 2.3.0-4
- KYOS-F: fix judgment of {?kylin}
* Thu Apr 13 2023 kpkg <kpkg.kylinsec.com.cn> - 2.3.0-3
- rebuild for KY3.4-5-GC-KiranUI-2.5
* Wed Apr 12 2023 kpkg <kpkg.kylinsec.com.cn> - 2.3.0-2
- rebuild for KiranUI-2.5-next
* 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
* Mon Aug 08 2022 luoqing <luoqing@kylinsec.com.cn> - 0.8.1-4
- KYOS-F: Modify license.
@ -73,7 +79,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