From cbe7d301ced818479fd0a45ea5fe06586756c6d0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Mon, 20 Jan 2025 23:57:07 -0500 Subject: [PATCH] * Mon Jan 20 2025 Jean-Philippe Pialasse 11.0.0-6.sme - remove copy or perl.prov for sme11 [SME: 12880] - remove openfusion [SME: 12881] --- root/etc/mock/smeserver-10-x86_64-base.cfg | 5 ----- root/etc/mock/smeserver-11-x86_64-base.cfg | 19 +++++++------------ smeserver-mock.spec | 6 +++++- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/root/etc/mock/smeserver-10-x86_64-base.cfg b/root/etc/mock/smeserver-10-x86_64-base.cfg index 215607f..f8d73a4 100644 --- a/root/etc/mock/smeserver-10-x86_64-base.cfg +++ b/root/etc/mock/smeserver-10-x86_64-base.cfg @@ -79,11 +79,6 @@ baseurl=http://download.fedoraproject.org/pub/epel/7/x86_64 #baseurl=http://buildsys.koozali.org/build/7/epel/x86_64 includepkgs=ccache mhash* perl-Taint-Util libdb4 libdb4-devel php-channel-horde php-horde-* perl-Class-Method-Modifiers perl-Class-XSAccessor perl-Devel-GlobalDestruction perl-Sub-Name perl-indirect perl-B-Hooks-OP-Check perl-ExtUtils-Depends perl-Lexical-SealRequireHints perl-Params-Classify perl-Dist-CheckConflicts perl-Math-Int64 perl-Sort-Naturally perl-Sub-Exporter* perl-Bytes-Random-Secure perl-Crypt-Random-TESHA2 perl-Crypt-Random-Seed perl-Math-Random-ISAAC kmodtool libmaxminddb-devel libmaxminddb perl-Module-Build-Tiny perl-Mojolicious perl-Net-CIDR-Lite mod_perl mod_perl-devel perl-Apache-Test pyzor perl-Linux-Pid perl-BSD-Resource perl-dev perl-Data-Dumper perl-Razor-Agent perl-generators* perl-Net-Patricia meson libidn2* ninja-build python36-Cython epel-rpm-macros lua-srpm-macros libnetfilter_log* courier-unicode* perl-Path-Class perl-String-Random perl-Test-Class perl-Test-Mojo perl-MRO-Compat perl-Class-Accessor libebml* libmatroska* pugixml* spdlog* multilib-rpm-config cmake3* libuv libzstd rhash google-benchmark* libnet10-* perl-Crypt-GPG gnupg1 perl-Lingua-Stem-Snowball* perl-Lingua-StopWords perl-rpm-build-perl* fmt* perl-Class-Virtual perl-Carp-Assert pyPdf python2-apipkg python2-bottle python2-dateutil python2-docutils python-gevent python2-simplejson python-sqlite3dbm python2-future python2-attrs python2-packaging python2-certifi perl-Email-MIME perl-Email-Simple perl-Net-IP perl-Net-SMTPS perl-Throwable perl-Sub-Override perl-Moose perl-Email-Abstract perl-Eval-Closure perl-Email-Date-Format perl-Devel-PartialDump perl-namespace-clean perl-B-Hooks-EndOfScope perl-Variable-Magic latexmk python3-sphinx* python36-sphinx* python36-pygments python36-jinja2 python36-docutils python36-markupsafe clamav* perl-TAP-Harness-Env rust ghc-* rust-* llvm13-libs pandoc golang* perl-Net-LibIDN* perl-Net-Patricia re2c perl-Data-Validate-IP perl-Clone-PP perl-ExtUtils-Manifest* perl-ExtUtils-InstallPaths* perl-ExtUtils-Helpers* perl-ExtUtils-Config* -[openfusion] -name=openfusion -baseurl=http://repo.openfusion.net/centos7-x86_64 -includepkgs=perl-Lingua* perl-Snowball* perl-Text-German perl-MooX* perl-Scalar-List-Utils perl-Throwable perl-Moose perl-Try-Tiny perl-Devel-StackTrace perl-Devel-OverloadInfo perl-Sub-Name perl-Module-Runtime-Conflicts perl-Test-File-ShareDir perl-Test-Exception perl-Test-Output perl-Net-IDN-Encode perl-Path-Tiny perl-Class-Tiny perl-Unicode-UTF8 perl-Net-Server perl-Email-Address-XS perl-MaxMind-* perl-Geo-IP perl-IP-Country-DB_File perl-IP-Country perl-Math-Int128 perl-Data-IEEE754 perl-namespace-autoclean perl-Net-Works perl-List-AllUtils perl-Data-Printer perl-IP-Country perl-Sub-Identify perl-Test-Warnings perl-Hash-FieldHash perl-Data-Dumper-Concise perl-Encode-Detect - [rpmfusion] name=rpmfusion baseurl=http://download1.rpmfusion.org/free/el/updates/7/x86_64 diff --git a/root/etc/mock/smeserver-11-x86_64-base.cfg b/root/etc/mock/smeserver-11-x86_64-base.cfg index 1b94e64..f281471 100644 --- a/root/etc/mock/smeserver-11-x86_64-base.cfg +++ b/root/etc/mock/smeserver-11-x86_64-base.cfg @@ -6,17 +6,17 @@ config_opts['bootstrap_image_ready'] = False config_opts['bootstrap_image'] = 'quay.io/rockylinux/rockylinux:8' # see bugs https://bugzilla.redhat.com/show_bug.cgi?id=2076847 and https://bugzilla.redhat.com/show_bug.cgi?id=2076847 -config_opts['plugin_conf']["copy_enable"] = True -config_opts['plugin_conf']['copy_opts']= { - 'files': [ ("/etc/mock/perl.prov", "/usr/lib/rpm/redhat/perl.prov"), - ("/etc/mock/perl.prov", "/usr/lib/rpm/perl.prov"), - ], -} +#config_opts['plugin_conf']["copy_enable"] = True +#config_opts['plugin_conf']['copy_opts']= { +# 'files': [ ("/etc/mock/perl.prov", "/usr/lib/rpm/redhat/perl.prov"), +# ("/etc/mock/perl.prov", "/usr/lib/rpm/perl.prov"), +# ], +#} config_opts['root'] = 'smeserver-11-x86_64' config_opts['target_arch'] = 'x86_64' config_opts['dist'] = '.el8.sme' -config_opts['chroot_setup_cmd'] = 'install glibc epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz ' +config_opts['chroot_setup_cmd'] = 'install glibc epel-rpm-macros bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz perl-interpreter perl-devel perl-generators' #' install @buildsys-build @buildsys scl-utils-build python27-build epel-rpm-macros ' # @buildsys-build @buildsys @@ -90,11 +90,6 @@ exclude=buildsys-macros name=epel baseurl = https://muug.ca/mirror/fedora-epel/8/Everything/x86_64/ -[openfusion] -name=openfusion -baseurl=http://repo.openfusion.net/centos8-x86_64 -#includepkgs=perl-Lingua* perl-Snowball* perl-Text-German perl-ExtUtils* perl-MooX* perl-Scalar-List-Utils perl-Throwable perl-Moose perl-Try-Tiny perl-Devel-StackTrace perl-Devel-OverloadInfo perl-Sub-Name perl-Module-Runtime-Conflicts perl-Test-File-ShareDir perl-Test-Exception perl-Test-Output perl-Net-IDN-Encode perl-Path-Tiny perl-Class-Tiny perl-Unicode-UTF8 perl-Net-Server - [rpmfusion] name=rpmfusion baseurl=http://download1.rpmfusion.org/free/el/updates/8/x86_64 diff --git a/smeserver-mock.spec b/smeserver-mock.spec index eaa88af..e4d369b 100644 --- a/smeserver-mock.spec +++ b/smeserver-mock.spec @@ -4,7 +4,7 @@ Summary: smeserver-mock tools for building RPMs %define name smeserver-mock Name: %{name} %define version 11.0.0 -%define release 5 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -28,6 +28,10 @@ BuildRequires: smeserver-devtools AutoReqProv: no %changelog +* Mon Jan 20 2025 Jean-Philippe Pialasse 11.0.0-6.sme +- remove copy or perl.prov for sme11 [SME: 12880] +- remove openfusion [SME: 12881] + * Sat Jan 11 2025 Trevor Batley 11.0.0-5.sme - fix typo of perl-File-Flat in includepkgs of smeserver-mock.config