1.35.4 release

installJRMC

@@ -21,12 +21,12 @@
 # shellcheck disable=SC2329
 shopt -s extglob
 
-declare -g SCRIPT_VERSION="1.35.2"
+declare -g SCRIPT_VERSION="1.35.4"
 declare -g MC_VERSION_HARDCODE="35.0.24" # do find all replace
 declare -g MC_REPO_HARDCODE="bookworm" # should match the MC_VERSION_HARDCODE
 declare -g BOARD_ID="92.0" # MC35 board ID for legacy latest version detection
 declare -gi SELF_UPDATE_SWITCH=1 # 0 to disable installJRMC self-update
-declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC" # self-update URL
+declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/branch/master/installJRMC" # self-update URL
 # declare -g SCRIPT_URL="https://raw.githubusercontent.com/cryobry/installJRMC/refs/heads/master/installJRMC" # backup URL
 declare -gi DEBUG=${DEBUG:-0} # set default debug and allow DEBUG env override (default: disabled)
 
@@ -992,32 +992,31 @@ build_rpm() {
 
   # Create spec file
   cat <<-EOF > "$spec_file"
-		Name:  mediacenter$MC_MVERSION
+		Name: mediacenter$MC_MVERSION
 		Version: $MC_VERSION
 		Release: $MC_RELEASE
 		Summary: JRiver Media Center
-		Group:   Applications/Media
+		Group: Applications/Media
+		License: LicenseRef-JRiver-Proprietary
+		URL: https://www.jriver.com/
 		Source0: $MC_SOURCE
-		%define _rpmfilename %%{ARCH}/%%{NAME}-%%{version}-%%{release}.%%{ARCH}.rpm
 
-		AutoReq:  0
+		BuildArch: $ARCH
+
+		%global _rpmfilename %%{ARCH}/%%{NAME}-%%{version}-%%{release}.%%{ARCH}.rpm
+
+		AutoReqProv: no
 
 		$requires_str
 		$recommends_str
 
-		Conflicts: MediaCenter
-
 		Provides: mediacenter$MC_MVERSION
 
-		License: Copyright 1998-$(date +%Y), JRiver, Inc.  All rights reserved.  Protected by U.S. patents #7076468 and #7062468
-		URL: https://www.jriver.com/
-
 		%define __provides_exclude_from ^%{_libdir}/jriver/.*/.*\\.so.*$
 
 		%description
 		Media Center is more than a world class player.
 
-		%global __os_install_post %{nil}
 		%prep
 
 		%build
@@ -1025,9 +1024,6 @@ build_rpm() {
 		%install
 		dpkg -x %{S:0} %{buildroot}
 
-		%post -p /sbin/ldconfig
-		%postun -p /sbin/ldconfig
-
 		%files
 		%{_bindir}/mediacenter$MC_MVERSION
 		$stub
@@ -1233,10 +1229,10 @@ run_createrepo() {
   fi
 
   # Run createrepo
-  local -a cr_opts=(-q "$CREATEREPO_WEBROOT")
+  local -a cr_opts=(--update)
   # [[ -d "$CREATEREPO_WEBROOT/repodata" ]] && cr_opts+=(--update) # TODO temporarily disabled for legacy createrepo
-  if ! execute sudo -u "$CREATEREPO_USER" createrepo "${cr_opts[@]}"; then
-    if ! (execute sudo createrepo "${cr_opts[@]}" && execute sudo chown -R "$CREATEREPO_USER:$CREATEREPO_USER" "$CREATEREPO_WEBROOT"); then
+  if ! execute sudo -u "$CREATEREPO_USER" createrepo "${cr_opts[@]}" "$CREATEREPO_WEBROOT"; then
+    if ! (execute sudo createrepo "${cr_opts[@]}" "$CREATEREPO_WEBROOT" && execute sudo chown -R "$CREATEREPO_USER:$CREATEREPO_USER" "$CREATEREPO_WEBROOT"); then
       err "createrepo failed"
       return 1
     fi