From cb7d568acb4e41726f570e9a8aaebfd6ec8d3d2239e434c0733aa8a788dbab63 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 19 May 2020 07:23:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=547 --- rpm.changes | 6 ------ rpm.spec | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rpm.changes b/rpm.changes index 41a6f7a..16ae783 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed May 13 10:42:04 UTC 2020 - Ludwig Nussel - -- Need to pull in glibc-gconv-modules in addition to glibc-locale as - it was split off - ------------------------------------------------------------------- Mon May 4 13:11:34 UTC 2020 - Dominique Leuenberger diff --git a/rpm.spec b/rpm.spec index dbfd75a..63b47fd 100644 --- a/rpm.spec +++ b/rpm.spec @@ -192,7 +192,6 @@ Requires: gcc #Requires: gcc-PIE Requires: gettext-tools Requires: glibc-devel -Requires: glibc-gconv-modules Requires: glibc-locale Requires: grep Requires: gzip @@ -224,7 +223,7 @@ Requires: python3-base %description build-python Provides and requires generator for .py files and modules. - + %package build-perl Summary: RPM dependency generator for Perl Group: Development/Languages/Perl @@ -257,7 +256,7 @@ cp config.guess config.sub db/dist/ %patch -P 70 -P 71 -P 73 -P 75 -P 77 -P 78 %patch -P 85 %patch -P 93 -P 94 -P 99 -%patch -P 100 -P 102 -P 103 +%patch -P 100 -P 102 -P 103 %patch -P 109 -P 117 %patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123 -P 124 -P 125