!172 Don't clean up libdiff and libcairo-script*
From: @wangchong1995924 Reviewed-by: @compile_success Signed-off-by: @compile_success
This commit is contained in:
commit
1074853f0a
34
0010-do-not-cleanup-pkg.patch
Normal file
34
0010-do-not-cleanup-pkg.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 90c2319b0fbde5e263f999288627cc67ec5fc9c0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: wangchong1995924 <15229716099@163.com>
|
||||||
|
Date: Thu, 14 Jul 2022 17:44:21 +0800
|
||||||
|
Subject: Don't clean up libdiff and libcairo-script*
|
||||||
|
|
||||||
|
---
|
||||||
|
isomaker/80-openeuler/runtime-cleanup.tmpl | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl
|
||||||
|
index 35b2c83..5bce798 100644
|
||||||
|
--- a/isomaker/80-openeuler/runtime-cleanup.tmpl
|
||||||
|
+++ b/isomaker/80-openeuler/runtime-cleanup.tmpl
|
||||||
|
@@ -67,7 +67,7 @@ removefrom iptables --allbut \
|
||||||
|
|
||||||
|
removepkg libXxf86misc
|
||||||
|
removepkg libasyncns libhbaapi libhbalinux
|
||||||
|
-removepkg libmcpp libtiff linux-atm-libs
|
||||||
|
+removepkg libmcpp linux-atm-libs
|
||||||
|
removepkg lvm2-libs m4 mailx makebootfat mcpp
|
||||||
|
removepkg mingetty mobile-broadband-provider-info pkgconfig ppp pth
|
||||||
|
removepkg rmt rpcbind squashfs-tools system-config-firewall-base
|
||||||
|
@@ -146,7 +146,7 @@ removefrom bind-utils /usr/bin/dig /usr/bin/host /usr/bin/nsupdate
|
||||||
|
removefrom bitmap-fangsongti-fonts /usr/share/fonts/*
|
||||||
|
removefrom ca-certificates /etc/pki/java/*
|
||||||
|
removefrom ca-certificates /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/*
|
||||||
|
-removefrom cairo /usr/${libdir}/libcairo-script* /usr/bin/cairo-sphinx
|
||||||
|
+removefrom cairo /usr/bin/cairo-sphinx
|
||||||
|
removefrom coreutils /etc/* /usr/bin/link /usr/bin/nice /usr/bin/stty /usr/bin/su /usr/bin/unlink
|
||||||
|
removefrom coreutils /usr/sbin/runuser /usr/bin/[ /usr/bin/base64 /usr/bin/chcon
|
||||||
|
removefrom coreutils /usr/bin/cksum /usr/bin/comm /usr/bin/csplit
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
12
oemaker.spec
12
oemaker.spec
@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting
|
|||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Version: 2.0.3
|
Version: 2.0.3
|
||||||
Release: 14
|
Release: 15
|
||||||
BuildRoot: %{_tmppath}/%{name}
|
BuildRoot: %{_tmppath}/%{name}
|
||||||
|
|
||||||
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
@ -31,8 +31,9 @@ Patch0004: 0004-bugfix-I3OGUT.patch
|
|||||||
Patch0005: 0005-add-fpi_tail-param-for-grub.patch
|
Patch0005: 0005-add-fpi_tail-param-for-grub.patch
|
||||||
Patch0006: 0006-support-usb-flash-drive-mode.patch
|
Patch0006: 0006-support-usb-flash-drive-mode.patch
|
||||||
Patch0007: 0007-restore-env-after-selinux-status-changes.patch
|
Patch0007: 0007-restore-env-after-selinux-status-changes.patch
|
||||||
Patch0008: 0008-add-parse_everything_deb_exclude.patch
|
Patch0008: 0008-add-parse_everything_deb_exclude.patch
|
||||||
Patch0009: 0009-automated-kickstart-function.patch
|
Patch0009: 0009-automated-kickstart-function.patch
|
||||||
|
Patch0010: 0010-do-not-cleanup-pkg.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
a building tool for DVD ISO making and ISO cutting
|
a building tool for DVD ISO making and ISO cutting
|
||||||
@ -136,6 +137,11 @@ rm -rf %{buildroot}
|
|||||||
rm -rf $RPM_BUILD_DIR/%{name}
|
rm -rf $RPM_BUILD_DIR/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 14 2022 wangchong <wangchong56@huawei.com> - 2.0.3-15
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: do not clean up libdiff and libcairo-script*
|
||||||
|
|
||||||
* Wed Apr 20 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-14
|
* Wed Apr 20 2022 xiangyuning <xiangyuning@huawei.com> - 2.0.3-14
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user