From e614ad023b80be756f28fcb8e262c3f341fb9e6d Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Sun, 2 Jan 2022 01:52:40 -0500
Subject: [PATCH] Add --universal flag

---
 README.md   |  2 ++
 installJRMC | 24 ++++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 265e80f..0f5494f 100755
--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@ You can always find the latest supported options by running `installJRMC --help`
     The webroot directory to install the repo (Default: /srv/jriver/)
 --createrepo-user USER
     The web server user (Default: current user)
+--universal
+    Build/install RPM without minimum version specifiers
 --version, -v
     Print this script version and exit
 --debug, -d
diff --git a/installJRMC b/installJRMC
index 356c9c2..c996c4b 100755
--- a/installJRMC
+++ b/installJRMC
@@ -23,7 +23,7 @@ shopt -s extglob
 _scriptversion="1.0b5"
 _outputdir="$PWD/output"
 _createrepo_webroot="/var/www/jriver"
-_exec_user="$(whoami)"
+_exec_user=$(whoami)
 _systemddir="/usr/lib/systemd/system"
 
 # MC version
@@ -68,6 +68,8 @@ printHelp() {
 		            The web server user (Default: current user)
             --createrepo-suse
                 Override OS detection and run --createrepo with SUSE RPM
+            --universal
+                Build/install RPM without minimum version specifiers
 		    --version, -v
 		        Print this script version and exit
 		    --debug, -d
@@ -236,7 +238,7 @@ parseInput() {
         _install="repo"
     fi
 
-    if _input=$(getopt -o +i:vdhus:c: -l install:,build,build-suse,outputdir:,mcversion:,restorefile:,betapass:,service-user:,service:,version,debug,help,uninstall,createrepo,createrepo-suse,createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests -- "$@"); then
+    if _input=$(getopt -o +i:vdhus:c: -l install:,build,build-suse,outputdir:,mcversion:,restorefile:,betapass:,service-user:,service:,version,debug,help,uninstall,createrepo,createrepo-suse,createrepo-webroot:,createrepo-user:,vncpass:,display:,container:,tests,universal -- "$@"); then
         eval set -- "$_input"
         while true; do
             case "$1" in
@@ -297,6 +299,9 @@ parseInput() {
                 --display)
                     shift && _display="$1"
                     ;;
+                --universal)
+                    _universal=true
+                    ;;
                 --container|-c)
                     shift && _containers+=("$1")
                     ;;
@@ -641,6 +646,8 @@ buildRPM() {
 		Requires: vulkan-headers >= 1.1
 		Requires: ca-certificates
 		Requires: libXScrnSaver
+		Recommends: vorbis-tools >= 1.4.0
+		Recommends: lame >= 3.0
 	EOF
 
     # SUSE dependency name variations
@@ -683,8 +690,12 @@ buildRPM() {
 			Requires: nss >= 3.42
 		EOF
     fi
-
-    #debug "Requires: $_requires"
+	
+	if [[ -v _universal ]]; then
+		# Strip minimum versions
+		_custom_requires=$(echo "$_custom_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}')
+		_global_requires=$(echo "$_global_requires" | awk -F" " 'NF == 4 {print $1 " " $2} NF != 4 {print $0}')
+	fi
 
     # Create spec file
     cat <<- EOF > "$_outputdir/SPECS/mediacenter.spec"
@@ -703,9 +714,6 @@ buildRPM() {
 		${_global_requires:-}
 		${_custom_requires:-}
 
-		Recommends: vorbis-tools >= 1.4.0
-		Recommends: lame >= 3.0
-
 		Provides: mediacenter$_mversion
 
 		License: Copyright 1998-2022, JRiver, Inc.  All rights reserved.  Protected by U.S. patents #7076468 and #7062468
@@ -1477,7 +1485,7 @@ main() {
 
         #rpm --upgrade "$_mcrpm"        
 
-        if installPackage --nocheck --nogpgcheck --nobest "$_mcrpm"; then
+        if installPackage --nocheck --nogpgcheck "$_mcrpm"; then
             echo "JRiver Media Center installed successfully"
         else
             err "JRiver Media Center installation failed"