| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-mock-1.0.old/root/etc/mock/smeserver-10-x86_64-base.cfg smeserver-mock-1.0/root/etc/mock/smeserver-10-x86_64-base.cfg |
| 2 |
|
|
--- smeserver-mock-1.0.old/root/etc/mock/smeserver-10-x86_64-base.cfg 2023-04-12 23:14:08.594000000 -0400 |
| 3 |
|
|
+++ smeserver-mock-1.0/root/etc/mock/smeserver-10-x86_64-base.cfg 2023-04-12 23:32:45.988000000 -0400 |
| 4 |
|
|
@@ -1,6 +1,14 @@ |
| 5 |
|
|
config_opts['package_manager'] = 'yum' |
| 6 |
|
|
config_opts['use_nspawn'] = False |
| 7 |
|
|
|
| 8 |
|
|
+# see bugs https://bugzilla.redhat.com/show_bug.cgi?id=2076847 and https://bugzilla.redhat.com/show_bug.cgi?id=2076847 |
| 9 |
|
|
+config_opts['plugin_conf']["copy_enable"] = True |
| 10 |
|
|
+config_opts['plugin_conf']['copy_opts']= { |
| 11 |
|
|
+ 'files': [ ("/etc/mock/perl.prov", "/usr/lib/rpm/redhat/perl.prov"), |
| 12 |
|
|
+ ("/etc/mock/perl.prov", "/usr/lib/rpm/perl.prov"), |
| 13 |
|
|
+ ], |
| 14 |
|
|
+} |
| 15 |
|
|
+ |
| 16 |
|
|
config_opts['root'] = 'smeserver-10-x86_64' |
| 17 |
|
|
config_opts['target_arch'] = 'x86_64' |
| 18 |
|
|
config_opts['dist'] = '.el7.sme' |
| 19 |
|
|
@@ -59,13 +67,13 @@ |
| 20 |
|
|
name=epel |
| 21 |
|
|
baseurl=http://download.fedoraproject.org/pub/epel/7/x86_64 |
| 22 |
|
|
#baseurl=http://buildsys.koozali.org/build/7/epel/x86_64 |
| 23 |
|
|
-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-Progressive 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-ExtUtils-MakeMaker perl-Data-Dumper perl-Razor-Agent perl-ExtUtils-Config perl-ExtUtils-Helpers perl-ExtUtils-InstallPaths perl-TAP-Harness-Env |
| 24 |
|
|
+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-ExtUtils-MakeMaker 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 fmt* google-benchmark* libnet10-* perl-Crypt-GPG gnupg1 perl-Lingua-Stem-Snowball* perl-Lingua-StopWords perl-rpm-build-perl* 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 |
| 25 |
|
|
+ |
| 26 |
|
|
+[openfusion] |
| 27 |
|
|
+name=openfusion |
| 28 |
|
|
+baseurl=http://repo.openfusion.net/centos7-x86_64 |
| 29 |
|
|
+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 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 |
| 30 |
|
|
|
| 31 |
|
|
-#[rpmforge] |
| 32 |
|
|
-#name=rpmforge |
| 33 |
|
|
-#baseurl=http://buildsys.koozali.org/build/7/rpmforge/x86_64 |
| 34 |
|
|
-#includepkgs=perl-Taint-Util |
| 35 |
|
|
- |
| 36 |
|
|
[rpmfusion] |
| 37 |
|
|
name=rpmfusion |
| 38 |
|
|
baseurl=http://download1.rpmfusion.org/free/el/updates/7/x86_64 |
| 39 |
|
|
@@ -79,12 +87,12 @@ |
| 40 |
|
|
[sclo-rh] |
| 41 |
|
|
name=sclo-rh |
| 42 |
|
|
baseurl=http://mirror.centos.org/centos/7/sclo/x86_64/rh |
| 43 |
|
|
-includepkgs=python27* python33* rh-mongodb26* rh-mongodb32* rh-mongodb34* nodejs010* rh-nodejs6* |
| 44 |
|
|
+includepkgs=python27* python33* rh-mongodb26* rh-mongodb32* rh-mongodb34* nodejs010* rh-nodejs6* devtoolset-* |
| 45 |
|
|
|
| 46 |
|
|
[buildsys-core] |
| 47 |
|
|
name=buildsys-core |
| 48 |
|
|
baseurl=http://buildsys.koozali.org/build/10/smeserver-core/x86_64 |
| 49 |
|
|
-includepkgs=bglibs buildsys-macros cvm* dietlibc* e-smith-devtools perl-Test-Inline perl-IO-Socket-IP perl-Geography-Countries perl-Object-Persistence perl-bareword-filehandles perl-multidimensional perl-strictures perl-Module-Runtime perl-Role-Tiny perl-Sub-Quote perl-Bytes-Random-Secure perl-Net-Ident perl-generators DCC |
| 50 |
|
|
+includepkgs=bglibs buildsys-macros cvm* dietlibc* e-smith-devtools perl-Test-Inline perl-IO-Socket-IP perl-Geography-Countries perl-Object-Persistence perl-bareword-filehandles perl-multidimensional perl-strictures perl-Module-Runtime perl-Role-Tiny perl-Sub-Quote perl-Bytes-Random-Secure perl-Net-Ident perl-generators DCC python3-lxml libnetfilter_acct* qmail perl-Net-IMAP-Simple perl-Regexp-Common perl-Email-Sender perl-Moo |
| 51 |
|
|
|
| 52 |
|
|
[buildsys-contribs] |
| 53 |
|
|
name=buildsys-contribs |
| 54 |
|
|
diff -Nur --no-dereference smeserver-mock-1.0.old/root/usr/bin/change-log smeserver-mock-1.0/root/usr/bin/change-log |
| 55 |
|
|
--- smeserver-mock-1.0.old/root/usr/bin/change-log 2023-04-12 23:14:08.608000000 -0400 |
| 56 |
|
|
+++ smeserver-mock-1.0/root/usr/bin/change-log 2023-04-12 23:21:21.238000000 -0400 |
| 57 |
|
|
@@ -5,7 +5,8 @@ |
| 58 |
|
|
dateH=`date "+%a %b %d %Y"`; |
| 59 |
|
|
|
| 60 |
|
|
|
| 61 |
|
|
-if [[ $1 ]] && [ -f $1 ] && [ ${1: -4} == ".spec" ] |
| 62 |
|
|
+#if [[ $1 ]] && [ -f $1 ] && [ ${1: -4} == ".spec" ] |
| 63 |
|
|
+if [[ $1 ]] && [ ${1##*.} == "spec" ] |
| 64 |
|
|
then |
| 65 |
|
|
specfile=$1 |
| 66 |
|
|
else |
| 67 |
|
|
@@ -20,7 +21,7 @@ |
| 68 |
|
|
#Release: 24 |
| 69 |
|
|
#Release: 24%{?dist} |
| 70 |
|
|
rele=0; |
| 71 |
|
|
-release=`cat $specfile|egrep '^%define (main_)?release'|tr '\t' ' ' |cut -d " " -f3|cut -d% -f1`; |
| 72 |
|
|
+release=`cat $specfile|egrep '^%define\s+(main_)?release'|sed -r 's/\s+/ /g'|cut -d " " -f3|cut -d% -f1`; |
| 73 |
|
|
if [[ ! $release ]]; then |
| 74 |
|
|
release=`cat $specfile|egrep '^Release:'|cut -d ":" -f2| tr -d "[:space:]"|cut -d% -f1`; |
| 75 |
|
|
rele=1; |
| 76 |
|
|
@@ -29,11 +30,12 @@ |
| 77 |
|
|
echo "search for version in $specfile"; |
| 78 |
|
|
#%define version 23 |
| 79 |
|
|
#Version: 23 |
| 80 |
|
|
-version=`cat $specfile|grep -i '%define version'|tr '\t' ' ' |cut -d " " -f3|cut -d% -f1`; |
| 81 |
|
|
+version=`cat $specfile|egrep -i '%define\s+version'|sed -r 's/\s+/ /g' |cut -d " " -f3|cut -d% -f1`; |
| 82 |
|
|
+echo "version : $version" |
| 83 |
|
|
if [[ ! $version ]]; then |
| 84 |
|
|
version=`cat $specfile|egrep '^Version:'|cut -d ":" -f2| tr -d "[:space:]"`; |
| 85 |
|
|
fi |
| 86 |
|
|
- |
| 87 |
|
|
+echo "version : $version" |
| 88 |
|
|
|
| 89 |
|
|
|
| 90 |
|
|
echo "update release"; |
| 91 |
|
|
@@ -48,9 +50,9 @@ |
| 92 |
|
|
release=`lua -e "print( $release + $addme)"`; |
| 93 |
|
|
echo "update release $oldrelease ==> $release"; |
| 94 |
|
|
if [ "$rele" -eq "0" ]; then |
| 95 |
|
|
- cat $specfile |sed -r "s/(^%define (main_)?release) *$oldrelease/\1 $release/">$specfile.tmp; |
| 96 |
|
|
+ cat $specfile |sed -r "s/(^%define\s+(main_)?release) *$oldrelease/\1 $release/">$specfile.tmp; |
| 97 |
|
|
else |
| 98 |
|
|
- cat $specfile |sed -r "s/(^Release:) *$oldrelease/\1 $release/">$specfile.tmp; |
| 99 |
|
|
+ cat $specfile |sed -r "s/(^Release:\s+)$oldrelease/\1$release/">$specfile.tmp; |
| 100 |
|
|
fi |
| 101 |
|
|
cat $specfile.tmp > $specfile; |
| 102 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
