!5 update upstream version 22.04.1

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2022-12-15 03:04:35 +00:00 committed by Gitee
commit 97cd982b2d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 6 additions and 34 deletions

View File

@ -1,27 +0,0 @@
From 0fce064dc0dd55853688b4aa51fa6ee4fccc4b43 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 20:08:28 +0800
Subject: [PATCH] changed the default value of application
---
debian/ukui-mimeapps.list | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/ukui-mimeapps.list b/debian/ukui-mimeapps.list
index e172c63..f60e65c 100755
--- a/debian/ukui-mimeapps.list
+++ b/debian/ukui-mimeapps.list
@@ -4,8 +4,8 @@ x-scheme-handler/http=firefox.desktop
x-scheme-handler/https=firefox.desktop
x-scheme-handler/about=firefox.desktop
x-scheme-handler/mailto=thunderbird.desktop
-application/x-deb=ubuntu-kylin-software-center.desktop
-application/x-debian-package=ubuntu-kylin-software-center.desktop
+application/x-deb=kylin-installer.desktop
+application/x-debian-package=kylin-installer.desktop
application/x-extension-eml=thunderbird.desktop
message/rfc822=thunderbird.desktop
inode/directory=peony-folder-handler.desktop
--
2.30.0

Binary file not shown.

View File

@ -1,13 +1,13 @@
%define debug_package %{nil}
Name: ubuntukylin-default-settings
Version: 20.04.2
Release: 2
Version: 22.04.1
Release: 1
Summary: Default settings for the Ubuntu Kylin desktop
License: GPL-3+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
patch0: 0001-changed-the-default-value-of-application.patch
BuildRequires: e2fsprogs
#BuildRequires: sassc
#Requires: ubuntukylin-keyring
@ -18,7 +18,6 @@ This package contains the default settings used by Ubuntu Kylin.
%prep
%setup -q
%patch0 -p1
%build
@ -27,8 +26,6 @@ This package contains the default settings used by Ubuntu Kylin.
mkdir -p %{buildroot}/usr/share/glib-2.0/schemas
cp -rf debian/20_ubuntukylin-default-settings.gschema.override %{buildroot}/usr/share/glib-2.0/schemas
mkdir -p %{buildroot}/etc/apt/sources.list.d/
cp -rf debian/ubuntukylin.list %{buildroot}/etc/apt/sources.list.d/
mkdir -p %{buildroot}/usr/share/applications
cp -rf debian/ukui-mimeapps.list %{buildroot}/usr/share/applications/
@ -58,7 +55,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%doc debian/copyright debian/changelog
%{_datadir}/glib-2.0/schemas/20_ubuntukylin-default-settings.gschema.override
%{_sysconfdir}/apt/sources.list.d/
%{_datadir}/applications/
%{_sysconfdir}/profile.d/
%{_datadir}/ubiquity/pixmaps/
@ -67,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/apport/native-origins.d/
%changelog
* Tue Nov 22 2022 tanyulong <tanyulong@kylinos.cn> - 22.04.1-1
- update upstream version 22.04.1
* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 20.04.2 -2
- changed the default value of application