simplify using vendor.tpl in all config

9 files changed, 21 insertions, 32 deletions

diff --git a/el7x.tpl b/el7x.tpl
index fb7b5dc..2943d8a 100644
--- a/el7x.tpl
+++ b/el7x.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['root'] = 'el7x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache devtoolset-6-toolchain devtoolset-7-toolchain devtoolset-8-toolchain devtoolset-10-toolchain'
@@ -16,10 +18,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 #config_opts['use_bootstrap'] = False
 
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".el7.remi"
 config_opts['macros']['%rhel']="7"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/el8x.tpl b/el8x.tpl
index e62b6a5..bd22b9c 100644
--- a/el8x.tpl
+++ b/el8x.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 ccache coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
@@ -19,10 +21,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".el8.remi"
 config_opts['macros']['%rhel']="8"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/el9x.tpl b/el9x.tpl
index 4c2856a..9e5bf7c 100644
--- a/el9x.tpl
+++ b/el9x.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
@@ -19,10 +21,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".el9.remi"
 config_opts['macros']['%rhel']="9"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/fc34i.tpl b/fc34i.tpl
index 2e8f4de..fc1109b 100644
--- a/fc34i.tpl
+++ b/fc34i.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['root'] = 'fc34i'
 config_opts['target_arch'] = 'i686'
 config_opts['chroot_setup_cmd'] = 'install @build ccache gcc'
@@ -20,10 +22,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".fc34.remi"
 config_opts['macros']['%fedora']="34"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/fc34x.tpl b/fc34x.tpl
index cd91557..b02e0b3 100644
--- a/fc34x.tpl
+++ b/fc34x.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['root'] = 'fc34x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache gcc'
@@ -20,10 +22,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".fc34.remi"
 config_opts['macros']['%fedora']="34"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/fc35i.tpl b/fc35i.tpl
index 64e13a1..239ae6b 100644
--- a/fc35i.tpl
+++ b/fc35i.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['root'] = 'fc35i'
 config_opts['target_arch'] = 'i686'
 config_opts['chroot_setup_cmd'] = 'install @build ccache gcc'
@@ -20,10 +22,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".fc35.remi"
 config_opts['macros']['%fedora']="35"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/fc35x.tpl b/fc35x.tpl
index 8f824f9..5e6f5be 100644
--- a/fc35x.tpl
+++ b/fc35x.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['root'] = 'fc35x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc'
@@ -20,10 +22,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".fc35.remi"
 config_opts['macros']['%fedora']="35"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/fc36x.tpl b/fc36x.tpl
index b78b87a..c30497e 100644
--- a/fc36x.tpl
+++ b/fc36x.tpl
@@ -1,3 +1,5 @@
+include('vendor.tpl')
+
 config_opts['root'] = 'fc36x'
 config_opts['target_arch'] = 'x86_64'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc'
@@ -20,10 +22,6 @@ config_opts['createrepo_command'] = '/usr/bin/createrepo -d -q -x *.src.rpm'
 
 config_opts['macros']['%_topdir']="/builddir/build"
 config_opts['macros']['%_smp_mflags']="-j10"
-config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
-config_opts['macros']['%packager']="Remi Collet"
-config_opts['macros']['%vendeur']="remi"
-config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
 config_opts['macros']['%dist']=".fc36.remi"
 config_opts['macros']['%fedora']="36"
 config_opts['macros']['%_with_ibase']="1"
diff --git a/vendor.tpl b/vendor.tpl
new file mode 100644
index 0000000..d08f60c
--- /dev/null
+++ b/vendor.tpl
@@ -0,0 +1,5 @@
+config_opts['macros']['%vendor']="Remi's RPM repository <https://rpms.remirepo.net/>"
+config_opts['macros']['%packager']="Remi Collet"
+config_opts['macros']['%vendeur']="remi"
+config_opts['macros']['%bugurl']="https://forum.remirepo.net/"
+