diff --git a/root/etc/mock/smeserver-11-x86_64-base.cfg b/root/etc/mock/smeserver-11-x86_64-base.cfg new file mode 100644 index 0000000..1b94e64 --- /dev/null +++ b/root/etc/mock/smeserver-11-x86_64-base.cfg @@ -0,0 +1,117 @@ +config_opts['package_manager'] = 'dnf' +config_opts['use_nspawn'] = False +#config_opts['nspawn_args] = +config_opts['use_bootstrap_image'] = False +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['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 ' +#' install @buildsys-build @buildsys scl-utils-build python27-build epel-rpm-macros ' +# @buildsys-build @buildsys + +#so perl will not complain +config_opts['environment']['LANG'] = os.environ.setdefault('LANG', 'en_US.UTF-8') + +#disable name resolution https://fedoraproject.org/wiki/Using_Mock_to_test_package_builds#Disable_domain_name_resolution +#config_opts['use_host_resolv'] = False + +config_opts['plugin_conf']['ccache_opts']['dir'] = "%(cache_topdir)s/ccache/x86_64/" + +config_opts['macros']['%distribution'] = "SME Server v11" +config_opts['macros']['%packager'] = "Koozali.org " +config_opts['macros']['%vendor'] = "Koozali.org " +config_opts['macros']['%dist'] = ".el8.sme" + +config_opts['module_setup_commands'] = [ + ('enable', 'php:remi-8.3,mariadb:10.5,python36:3.6'), + ('install', 'php:remi-8.3'), +] + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +cachedir=/var/cache/yum +debuglevel=4 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +metadata_expire=0 +mdpolicy=group:primary +best=1 +install_weak_deps=0 +protected_packages= +module_platform_id=platform:el8 +user_agent={{ user_agent }} + + +[BaseOs] +name=BaseOs +baseurl = https://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/ +#baseurl=http://buildsys.koozali.org/build/7/os/x86_64 +#exclude=buildsys-macros + +[koji-dist-sme11-os-build] +name=dist-sme11-os-build +baseurl=http://koji.koozali.org/kojifiles/repos-dist/dist-sme11-os/latest/x86_64 + + +[appstream] +baseurl = https://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os/ +#mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=AppStream-8 +name = Rocky appstream + +[powertools] +baseurl = https://dl.rockylinux.org/pub/rocky/8/PowerTools/x86_64/os/ +mirrorlist = https://mirrors.rockylinux.org/mirrorlist?arch=x86_64&repo=PowerTools-8 +name = Rocky powertools + +[smeos] +name=smeos +baseurl=http://buildsys.koozali.org/build/11/smeos/x86_64 +exclude=buildsys-macros + +[epel] +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 +#includepkgs=ffmpeg* libva* x264-libs xvidcore librtmp buildsys-build-rpmfusion-* libmpeg2* mpeg2dec + +[remi-safe] +name=remi-safe +baseurl=http://rpms.remirepo.net/enterprise/8/safe/x86_64/ + +[remi] +name=remi +baseurl=http://rpms.remirepo.net/enterprise/8/remi/x86_64/ + +[remi-modular] +name=remi-modular +baseurl=http://rpms.remirepo.net/enterprise/8/modular/x86_64/ + + +""" + diff --git a/root/etc/yum.repos.d/smeserver-mock.repo b/root/etc/yum.repos.d/smeserver-mock.repo index 3816156..10bb56f 100644 --- a/root/etc/yum.repos.d/smeserver-mock.repo +++ b/root/etc/yum.repos.d/smeserver-mock.repo @@ -1,41 +1,8 @@ [smeserver-mock] enabled=1 -mirrorlist=http://mirrorlist.contribs.org/mirrorlist/smeos-10 +mirrorlist=http://mirrorlist.contribs.org/mirrorlist/smeos-11 name=SME Server - os smeserver-mock gpgcheck=0 enablegroups=1 -includepkgs=smeserver-mock - -[smeserver-mock-updates] -enabled=1 -mirrorlist=http://mirrorlist.contribs.org/mirrorlist/smeupdates-10 -name=SME Server - updates smeserver-mock -gpgcheck=1 -enablegroups=1 -includepkgs=smeserver-mock - -[smeserver-mock-test] -enabled=0 -mirrorlist=http://mirrorlist.contribs.org/mirrorlist/smetest-10 -name=SME Server - test smeserver-mock -gpgcheck=0 -enablegroups=1 -includepkgs=smeserver-mock - -[smeserver-mock-dev] -enabled=0 -mirrorlist=http://mirrorlist.contribs.org/mirrorlist/smedev-10 -name=SME Server - dev smeserver-mock -gpgcheck=0 -enablegroups=1 -includepkgs=smeserver-mock - -[smeserver-mock-updates-testing] -enabled=0 -mirrorlist=http://mirrorlist.contribs.org/mirrorlist/smeupdates-testing-10 -name=SME Server - updates-testing smeserver-mock -gpgcheck=0 -enablegroups=1 -includepkgs=smeserver-mock - +includepkgs=smeserver-mock,smeserver-devtools,perl-Algorithm-Dependency,prl-File-Flat,perl-File-chmod,perl-JSON-PP,perl-Test-Inline diff --git a/root/usr/bin/change-log b/root/usr/bin/change-log index 95c3914..02b488f 100755 --- a/root/usr/bin/change-log +++ b/root/usr/bin/change-log @@ -9,8 +9,11 @@ dateH=`date "+%a %b %d %Y"`; if [[ $1 ]] && [ ${1##*.} == "spec" ] then specfile=$1 -else +elif [ -d ./CVS ] +then specfile=`grep '\.spec' ./CVS/Entries|cut -d'/' -f2` +else +specfile=`ls *.spec|head -n1` fi echo "search for release in $specfile"; @@ -57,7 +60,7 @@ fi cat $specfile.tmp > $specfile; echo "updating changelog $specfile"; -entete="* $dateH ME MYSELF $version-$release.sme" +entete="* $dateH $USER <$USER@koozali.org> $version-$release.sme" changelog="- fix [SME: ]" cat $specfile |sed "/^%changelog/a $entete\n$changelog\n" >$specfile.tmp; cat $specfile.tmp>$specfile; diff --git a/smeserver-mock.spec b/smeserver-mock.spec index 51feeca..09c45b7 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 3 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,7 +15,10 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: smeserver-devtools Requires: mock -Requires: glances +Requires: glances +Requires: koji +Requires: git git-lfs +Requires: lua Requires: make rpm-build rpm-sign wget Requires: cmake automake libtool BuildRequires: smeserver-devtools @@ -25,6 +28,10 @@ BuildRequires: smeserver-devtools AutoReqProv: no %changelog +* Wed Dec 18 2024 Jean-Philippe Pialasse 11.0.0-4.sme +- update dnf repo [SME: 12829] +- add sme11 mock file + * Thu Apr 04 2024 Brian Read 11.0.0-3.sme - Set license file to GPL2.0 [SME: 12577]