summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--buildfct73
-rwxr-xr-xgetmock22
-rwxr-xr-xmkallrepo14
-rwxr-xr-xpearup2
4 files changed, 40 insertions, 71 deletions
diff --git a/buildfct b/buildfct
index 1c0b753..b9bfa86 100644
--- a/buildfct
+++ b/buildfct
@@ -56,25 +56,25 @@ mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
#alias mockfc36xr72=" mock --configdir=$mocketc -r fc36xr72 rebuild "
#alias mockfc36xm=" mock --configdir=$mocketc -r fc36xm rebuild "
-alias mockfc37i=" setarch i686 mock --configdir=$mocketc -r fc37i --arch i686 rebuild "
-alias mockfc37x=" mock --configdir=$mocketc -r fc37x rebuild "
-alias mockfc37xd=" mock --configdir=$mocketc -r fc37xd rebuild "
-alias mockfc37xr=" mock --configdir=$mocketc -r fc37xr rebuild "
-alias mockfc37x74=" mock --configdir=$mocketc -r fc37x74 rebuild "
-alias mockfc37x80=" mock --configdir=$mocketc -r fc37x80 rebuild "
-alias mockfc37x81=" mock --configdir=$mocketc -r fc37x81 rebuild "
-alias mockfc37x82=" mock --configdir=$mocketc -r fc37x82 rebuild "
-alias mockfc37x83=" mock --configdir=$mocketc -r fc37x83 rebuild "
-alias mockfc37xscl74=" mock --configdir=$mocketc -r fc37xscl74 rebuild "
-alias mockfc37xscl80=" mock --configdir=$mocketc -r fc37xscl80 rebuild "
-alias mockfc37xscl81=" mock --configdir=$mocketc -r fc37xscl81 rebuild "
-alias mockfc37xscl82=" mock --configdir=$mocketc -r fc37xscl82 rebuild "
-alias mockfc37xscl83=" mock --configdir=$mocketc -r fc37xscl83 rebuild "
-alias mockfc37xr60=" mock --configdir=$mocketc -r fc37xr60 rebuild "
-alias mockfc37xr62=" mock --configdir=$mocketc -r fc37xr62 rebuild "
-alias mockfc37xr70=" mock --configdir=$mocketc -r fc37xr70 rebuild "
-alias mockfc37xr72=" mock --configdir=$mocketc -r fc37xr72 rebuild "
-alias mockfc37xm=" mock --configdir=$mocketc -r fc37xm rebuild "
+#alias mockfc37i=" setarch i686 mock --configdir=$mocketc -r fc37i --arch i686 rebuild "
+#alias mockfc37x=" mock --configdir=$mocketc -r fc37x rebuild "
+#alias mockfc37xd=" mock --configdir=$mocketc -r fc37xd rebuild "
+#alias mockfc37xr=" mock --configdir=$mocketc -r fc37xr rebuild "
+#alias mockfc37x74=" mock --configdir=$mocketc -r fc37x74 rebuild "
+#alias mockfc37x80=" mock --configdir=$mocketc -r fc37x80 rebuild "
+#alias mockfc37x81=" mock --configdir=$mocketc -r fc37x81 rebuild "
+#alias mockfc37x82=" mock --configdir=$mocketc -r fc37x82 rebuild "
+#alias mockfc37x83=" mock --configdir=$mocketc -r fc37x83 rebuild "
+#alias mockfc37xscl74=" mock --configdir=$mocketc -r fc37xscl74 rebuild "
+#alias mockfc37xscl80=" mock --configdir=$mocketc -r fc37xscl80 rebuild "
+#alias mockfc37xscl81=" mock --configdir=$mocketc -r fc37xscl81 rebuild "
+#alias mockfc37xscl82=" mock --configdir=$mocketc -r fc37xscl82 rebuild "
+#alias mockfc37xscl83=" mock --configdir=$mocketc -r fc37xscl83 rebuild "
+#alias mockfc37xr60=" mock --configdir=$mocketc -r fc37xr60 rebuild "
+#alias mockfc37xr62=" mock --configdir=$mocketc -r fc37xr62 rebuild "
+#alias mockfc37xr70=" mock --configdir=$mocketc -r fc37xr70 rebuild "
+#alias mockfc37xr72=" mock --configdir=$mocketc -r fc37xr72 rebuild "
+#alias mockfc37xm=" mock --configdir=$mocketc -r fc37xm rebuild "
alias mockfc38i=" setarch i686 mock --configdir=$mocketc -r fc38i --arch i686 rebuild "
alias mockfc38x=" mock --configdir=$mocketc -r fc38x rebuild "
@@ -317,7 +317,7 @@ fi
if [ -f "$1" ]; then
date +%X
pids=""
- for i in 39 38 37
+ for i in 39 38
do
echo -n ""
(mock $quiet --configdir=$mocketc -r fc${i}x rebuild "$@" && echo "$(date +%X) (8x) fc$i Ok." || echo "fc$1 Error !")&
@@ -357,9 +357,6 @@ if [ -f "$1" ]; then
(mock $quiet --configdir=$mocketc -r fc38x rebuild "$@" && echo "$(date +%X) (82) fc38 Ok." || echo "fc38 Error !")&
pids="$pids $!"
echo -n ""
- (mock $quiet --configdir=$mocketc -r fc37x rebuild "$@" && echo "$(date +%X) (81) fc37 Ok." || echo "fc37 Error !")&
- pids="$pids $!"
- echo -n ""
(mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php81 rebuild "$@" && echo "$(date +%X) (81) el7 Ok." || echo "el7 Error !")&
pids="$pids $!"
echo -n ""
@@ -565,7 +562,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 38 39
+ for i in 38 39
do
echo -n "$(date +%X) 74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -591,7 +588,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 37 38
+ for i in 39 38
do
echo -n "$(date +%X) scl83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -617,7 +614,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 38 37
+ for i in 39 38
do
echo -n "$(date +%X) scl82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -643,7 +640,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 37 38
+ for i in 39 38
do
echo -n "$(date +%X) scl81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -669,8 +666,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r60 f37 "
- mock $quiet --configdir=$mocketc -r fc37xr60 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r60 f38 "
mock $quiet --configdir=$mocketc -r fc38xr60 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r60 f39 "
@@ -697,8 +692,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r62 f37 "
- mock $quiet --configdir=$mocketc -r fc37xr62 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r62 f38 "
mock $quiet --configdir=$mocketc -r fc38xr62 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r62 f39 "
@@ -725,8 +718,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r72 f37 "
- mock $quiet --configdir=$mocketc -r fc37xr72 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r72 f38 "
mock $quiet --configdir=$mocketc -r fc38xr72 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r72 f39 "
@@ -753,8 +744,6 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- echo -n "$(date +%X) r70 f37 "
- mock $quiet --configdir=$mocketc -r fc37xr70 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r70 f38 "
mock $quiet --configdir=$mocketc -r fc38xr70 rebuild "$@" && echo " Ok." || echo " Error !"
echo -n "$(date +%X) r70 f39 "
@@ -781,7 +770,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 38 39
+ for i in 38 39
do
echo -n "$(date +%X) 83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -828,7 +817,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 38 39
+ for i in 38 39
do
echo -n "$(date +%X) 83 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x83 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -849,7 +838,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 37 38
+ for i in 39 38
do
echo -n "$(date +%X) 82 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x82 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -875,7 +864,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 38 39
+ for i in 38 39
do
echo -n "$(date +%X) 81 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x81 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -901,7 +890,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 37 38 39
+ for i in 38 39
do
echo -n "$(date +%X) 80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}x80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -927,7 +916,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 37 38
+ for i in 39 38
do
echo -n "$(date +%X) scl80 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl80 rebuild "$@" && echo " Ok." || echo " Error !"
@@ -953,7 +942,7 @@ if [ "$1" = "-q" ]; then
fi
if [ -f "$1" ]; then
- for i in 39 37 38
+ for i in 39 38
do
echo -n "$(date +%X) scl74 fc$i "
mock $quiet --configdir=$mocketc -r fc${i}xscl74 rebuild "$@" && echo " Ok." || echo " Error !"
diff --git a/getmock b/getmock
index 260d5c7..2679c3a 100755
--- a/getmock
+++ b/getmock
@@ -469,7 +469,6 @@ elif [ $1 = all73 ]; then
elif [ $1 = all74 ]; then
[ $opt = remi ] && opt=php74
[ $opt = test ] && opt=test74
- getOneMock fc37x74 $opt '*7.4*'
getOneMock fc38x74 $opt '*7.4*'
getOneMock fc39x74 $opt '*7.4*'
getOneMock fc39a74 $opt '*7.4*'
@@ -482,7 +481,6 @@ elif [ $1 = all74 ]; then
elif [ $1 = all80 ]; then
[ $opt = remi ] && opt=php80
[ $opt = test ] && opt=test80
- getOneMock fc37x80 $opt '*8.0*'
getOneMock fc38x80 $opt '*8.0*'
getOneMock fc39x80 $opt '*8.0*'
getOneMock fc39a80 $opt '*8.0*'
@@ -495,7 +493,6 @@ elif [ $1 = all80 ]; then
elif [ $1 = all81 ]; then
[ $opt = remi ] && opt=php81
[ $opt = test ] && opt=test81
- getOneMock fc37x81 $opt '*8.1*'
getOneMock fc38x81 $opt '*8.1*'
getOneMock fc39x81 $opt '*8.1*'
getOneMock fc39a81 $opt '*8.1*'
@@ -508,7 +505,6 @@ elif [ $1 = all81 ]; then
elif [ $1 = all82 ]; then
[ $opt = remi ] && opt=php82
[ $opt = test ] && opt=test82
- getOneMock fc37x82 $opt '*8.2*'
getOneMock fc38x82 $opt '*8.2*'
getOneMock fc39x82 $opt '*8.2*'
getOneMock fc39a82 $opt '*8.2*'
@@ -521,7 +517,6 @@ elif [ $1 = all82 ]; then
elif [ $1 = all83 ]; then
[ $opt = remi ] && opt=php83
[ $opt = test ] && opt=test83
- getOneMock fc37x83 $opt '*8.3*'
getOneMock fc38x83 $opt '*8.3*'
getOneMock fc39x83 $opt '*8.3*'
getOneMock fc39a83 $opt '*8.3*'
@@ -579,7 +574,6 @@ elif [ $1 = allr60 ]; then
opt=remi
getOneMock el7x $opt '*6.0*'
opt=redis60
- getOneMock fc37x $opt '*6.0*'
getOneMock fc38x $opt '*6.0*'
getOneMock fc39x $opt '*6.0*'
getOneMock fc39a $opt '*6.0*'
@@ -592,7 +586,6 @@ elif [ $1 = allr62 ]; then
opt=remi
getOneMock el7x $opt '*6.2*'
opt=redis62
- getOneMock fc37x $opt '*6.2*'
getOneMock fc38x $opt '*6.2*'
getOneMock fc39x $opt '*6.2*'
getOneMock fc39a $opt '*6.2*'
@@ -605,7 +598,6 @@ elif [ $1 = allr70 ]; then
opt=remi
getOneMock el7x $opt '*7.0*'
opt=redis70
- getOneMock fc37x $opt '*7.0*'
getOneMock fc38x $opt '*7.0*'
getOneMock fc39x $opt '*7.0*'
getOneMock fc39a $opt '*7.0*'
@@ -618,7 +610,6 @@ elif [ $1 = allr72 ]; then
opt=remi
getOneMock el7x $opt '*7.2*'
opt=redis72
- getOneMock fc37x $opt '*7.2*'
getOneMock fc38x $opt '*7.2*'
getOneMock fc39x $opt '*7.2*'
getOneMock fc39a $opt '*7.2*'
@@ -632,7 +623,6 @@ elif [ $1 = allm ]; then
getOneMock el7x $opt '*1.6*'
getOneMock el8x $opt '*1.6*'
opt=memcached
- getOneMock fc37x $opt '*1.6*'
getOneMock fc38x $opt '*1.6*'
getOneMock fc39x $opt '*1.6*'
getOneMock fc39a $opt '*1.6*'
@@ -656,7 +646,7 @@ elif [ $1 = for55 ]; then
done
elif [ $1 = allx ]; then
- for i in 37 38 39
+ for i in 38 39
do
getOneMock fc${i}x $opt
done
@@ -706,7 +696,7 @@ elif [ $1 = scl71 ]; then
done
elif [ $1 = scl82 ]; then
- for i in 37 38 39
+ for i in 38 39
do
getOneMock scl82fc${i}x $opt
done
@@ -719,7 +709,7 @@ elif [ $1 = scl82 ]; then
getOneMock scl82el9a $opt
elif [ $1 = scl83 ]; then
- for i in fc37 fc38 fc39 el7 el8 el9
+ for i in fc38 fc39 el7 el8 el9
do
getOneMock scl83${i}x $opt
done
@@ -728,7 +718,7 @@ elif [ $1 = scl83 ]; then
getOneMock scl83el9a $opt
elif [ $1 = scl81 ]; then
- for i in 37 38 39
+ for i in 38 39
do
getOneMock scl81fc${i}x $opt
done
@@ -741,7 +731,7 @@ elif [ $1 = scl81 ]; then
getOneMock scl81el9a $opt
elif [ $1 = scl80 ]; then
- for i in 37 38 39
+ for i in 38 39
do
getOneMock scl80fc${i}x $opt
done
@@ -754,7 +744,7 @@ elif [ $1 = scl80 ]; then
getOneMock scl80el9a $opt
elif [ $1 = scl74 ]; then
- for i in 37 38 39
+ for i in 38 39
do
getOneMock scl74fc${i}x $opt
done
diff --git a/mkallrepo b/mkallrepo
index d4516eb..464983b 100755
--- a/mkallrepo
+++ b/mkallrepo
@@ -5,13 +5,12 @@ TMPLNK=$(mktemp)
TMPSIG2000=$(mktemp -t XXXXXXXX.2000)
TMPSIG2018=$(mktemp -t XXXXXXXX.2018)
TMPSIG2021=$(mktemp -t XXXXXXXX.2021)
-TMPSIG2022=$(mktemp -t XXXXXXXX.2022)
TMPSIG2023=$(mktemp -t XXXXXXXX.2023)
TMPSIG2024=$(mktemp -t XXXXXXXX.2024)
cd /home/rpmbuild/site/rpms
-for dep in fedora/{37,38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in fedora/{38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
@@ -46,8 +45,6 @@ if [ -s $TMPSIG ]; then
grep el8 $TMPSIG > $TMPSIG2018
# 2021
grep el9 $TMPSIG > $TMPSIG2021
- # 2022
- grep fc37 $TMPSIG > $TMPSIG2022
# 2023
grep fc38 $TMPSIG > $TMPSIG2023
grep fc39 $TMPSIG >> $TMPSIG2023
@@ -68,13 +65,6 @@ if [ -s $TMPSIG ]; then
else exit 1
fi
fi
- if [ -s $TMPSIG2022 ]; then
- echo "== Signature des $(cat $TMPSIG2022 | wc -l) nouveaux RPM (2022) =="
- if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name 845160D23149DAD504F0A32D83C0639E1FEF0014" --addsign $(cat $TMPSIG2022)
- then echo done.
- else exit 1
- fi
- fi
if [ -s $TMPSIG2021 ]; then
echo "== Signature des $(cat $TMPSIG2021 | wc -l) nouveaux RPM (2021) =="
if rpmsign --define '_gpg_path /home/remi/.gnupgrpm' --define "_gpg_name B1ABF71E14C9D74897E198A8B19527F1478F8947" --addsign $(cat $TMPSIG2021)
@@ -114,7 +104,7 @@ then echo "== Création des liens (noarch) =="
else echo "Rien à lier."
fi
-for dep in SRPMS fedora/{37,38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
+for dep in SRPMS fedora/{38,39}/*/{i386,x86_64,aarch64} enterprise/{7,8,9}/*/{i386,x86_64,armhfp,aarch64}
do
[[ $dep =~ /modular ]] && continue
[[ $dep =~ /debug-modular ]] && continue
diff --git a/pearup b/pearup
index b4a023c..556bd2a 100755
--- a/pearup
+++ b/pearup
@@ -35,7 +35,7 @@ if [ "x$5" = "xGA" ]; then
sed -e '/global upstream_prever/s/^%global/#global/' \
-i *spec
elif [ -n "$5" ]; then
- sed -e "/global upstream_prever/s/$4/$5/" \
+ sed -e "/global upstream_prever/s/prever.*$/prever $5/" \
-i *spec
newver="$2$5"
rpmver="$2~$5"