#1 Update RHEL patch
Closed a year ago by yselkowitz. Opened a year ago by yselkowitz.
rpms/ yselkowitz/tcsh rawhide  into  rawhide

@@ -104,7 +104,7 @@ 

  --- a/tests/variables.at

  +++ b/tests/variables.at

  @@ -976,6 +976,34 @@ AT_CHECK([tcsh -f -c 'echo $?tcsh'], ,

-  AT_CLEANUP

+  AT_CLEANUP()

   

   

  +AT_SETUP([$ tcsh_posix_status])
@@ -132,7 +132,7 @@ 

  +1

  +])

  +

- +AT_CLEANUP

+ +AT_CLEANUP()

  +

  +

   AT_SETUP([$ term])

file modified
+1 -3
@@ -52,9 +52,7 @@ 

  

  # Downstream patches for RHEL -- patches that we keep only in RHEL for various

  # ---------------------------    reasons, but are not enabled in Fedora:

- %if %{defined rhel} || %{defined centos}

  Patch200: tcsh-6.20.00-tcsh-posix-status.patch

- %endif

  

  

  # Patches to be removed -- deprecated functionality which shall be removed at
@@ -88,7 +86,7 @@ 

  # Amend the converted files to the initial commit, and patch the source code:

  git add --all --force

  git commit --all --amend --no-edit > /dev/null

- %autopatch -p1

+ %autopatch -p1 %{?!rhel:-M 199}

  

  # ---------------

  

Also, make Fedora and RHEL/CentOS SRPMs interchangeable.

ELN scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=96097310

Any chance of getting this in before the mass rebuild?

Applied just the RHEL patch update directly.

Pull-Request has been closed by yselkowitz

a year ago