git: merge conflict resolved

Tools/git/build

@@ -11,7 +11,6 @@ pbuild::pre_configure_Darwin() {
 	export NO_APPLE_COMMON_CRYPTO=1
 }
 
-
 pbuild::pre_configure() {
 	#pbuild::add_configure_args "LIBS=-lintl"
 	pbuild::add_configure_args "--with-tcltk"

Tools/git/files/config.yaml

@@ -6,7 +6,6 @@ git:
     group: Tools
     overlay: base
     relstage: stable
-    systems: [rhel6, rhel7, rhel8]
     compile_in_sourcetree: true
     urls:
       - url: https://mirrors.edge.kernel.org/pub/software/scm/git/git-${V_PKG}.tar.xz
@@ -21,21 +20,38 @@ git:
     git-2.8.1.tar.xz: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
     git-2.3.3.tar.gz: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
   versions:
+    2.45.2:
+      config:
+        runtime_deps: [TclTk/8.6.9, openssl/1.1.1w]
+        build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
+        relstage: unstable
+        overlay: devel
+        docfiles: [COPYING, README.md]
+        configure_args:
+          - --with-tcltk
+          - --with-iconv=${GETTEXT_PREFIX}
+          - --with-perl=${PERL_PREFIX}/bin/perl
+        sub_packages:
+          - name: git-lfs
+            version: 3.5.1
+            build_args:
     2.43.1:
       config:
         runtime_deps: [TclTk/8.6.9]
         build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8, openssl/1.1.1w]
         relstage: unstable
         overlay: devel
-        systems: [rhel7, rhel8, rhel9]
         docfiles: [COPYING, README.md]
+        configure_args:
+          - --with-tcltk
+          - --with-iconv=${GETTEXT_PREFIX}
+          - --with-perl=${PERL_PREFIX}/bin/perl
     2.42.0:
       config:
         runtime_deps: [TclTk/8.6.9]
         build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
         relstage: unstable
         overlay: devel
-        systems: [rhel7, rhel8, rhel9]
         docfiles: [COPYING, README.md]
     2.39.1;2.37.2;2.37.0;2.33.1;2.30.0;2.22.0;2.21.0:
       config:
@@ -44,3 +60,17 @@ git:
     2.3.3;2.8.1:
       config:
         runtime_deps: [Tcl/8.6.9, Tk/8.6.9]
+
+git-lfs:
+  type: sub_package
+  defaults:
+    compile_in_sourcetree: true
+  versions:
+    3.5.1:
+      config:
+      variants:
+        -
+          kernels: [Linux]
+          target_cpus: [x86_64]
+          urls:
+            - url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz

Tools/gnuplot/build-yaml

@@ -1,9 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::pre_configure() {
-	pbuild::add_configure_args '--with-latex=no'
-	pbuild::add_configure_args '--with-qt=no'
-}
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8

Tools/gnuplot/files/config.yaml

@@ -1,13 +1,14 @@
+---
 format: 1
 gnuplot:
   defaults:
     group: Tools
-    overlay: base 
+    overlay: base
     relstage: stable
     systems: [rhel8, rhel7, rhel6]
     docfiles: [Copyright, NEWS, README]
     urls:
-      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz 
+      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz
   shasums:
     gnuplot-5.4.10.tar.gz: 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c
     gnuplot-5.4.9.tar.gz: a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97
@@ -27,7 +28,16 @@ gnuplot:
   versions:
     5.4.{0,1,2,3,4,5,8,9};5.2.{0,4,6,7,8};5.0.0;4.6.3:
     5.4.10:
+      config:
+        relstage: stable
+    6.0.0:
       config:
         relstage: unstable
-
+        systems: [rhel*]
+        configure_args: ['--with-latex=no', '--with-qt=no']
+    6.0.1:
+      config:
+        relstage: unstable
+        systems: [rhel*]
+        configure_args: ['--with-latex=no', '--with-qt=no']