From c5239e34e50c6f4ef5fba63922c2ed7854c48729 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:34:28 +0000
Subject: import rcs-5.9.0-7.el7


---

diff --git a/SOURCES/rcs-5.9-rlog_fix_locks.patch b/SOURCES/rcs-5.9-rlog_fix_locks.patch
new file mode 100644
index 0000000..0423532
--- /dev/null
+++ b/SOURCES/rcs-5.9-rlog_fix_locks.patch
@@ -0,0 +1,20 @@
+diff -up rcs-5.9.0/src/rlog.c.fix_locks rcs-5.9.0/src/rlog.c
+--- rcs-5.9.0/src/rlog.c.fix_locks	2019-04-24 18:24:50.631189377 +0200
++++ rcs-5.9.0/src/rlog.c	2019-04-24 18:25:03.060364074 +0200
+@@ -894,7 +894,6 @@ rlog_main (const char *cmd, int argc, ch
+         repo_filename = REPO (filename);
+         tip = REPO (tip);
+         defbr = GROK (branch);
+-        locks = GROK (locks);
+         strictly_locking = BE (strictly_locking);
+         kws = BE (kws);
+ 
+@@ -902,6 +901,8 @@ rlog_main (const char *cmd, int argc, ch
+         if (lockflag)
+           trunclocks (&criteria);
+ 
++        locks = GROK (locks);
++
+         /* Do nothing if ‘-L’ is given and there are no locks.  */
+         if (onlylockflag && !locks)
+           continue;
diff --git a/SPECS/rcs.spec b/SPECS/rcs.spec
index 175f0e2..da9507d 100644
--- a/SPECS/rcs.spec
+++ b/SPECS/rcs.spec
@@ -1,13 +1,14 @@
 Summary: Revision Control System (RCS) file version management tools
 Name: rcs
 Version: 5.9.0
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
 Source: ftp://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.xz
 Patch0: rcs-5.8-build-tweaks.patch
 Patch1: rcs-5.9-coperf.patch
+Patch2: rcs-5.9-rlog_fix_locks.patch
 Provides: bundled(gnulib)
 BuildRequires: autoconf
 BuildRequires: groff
@@ -32,6 +33,7 @@ different versions of files.
 %setup -q
 %patch0 -p1 -b .build-tweaks
 %patch1 -p1 -b .coperf
+%patch2 -p1 -b .rlog_fix_locks
 autoconf
 
 %build
@@ -64,6 +66,14 @@ fi
 %{_infodir}/*
 
 %changelog
+* Tue Jul 23 2019 Matej Mužila <mmuzila@redhat.com> - 5.9.0-7
+- Rebuild against current buildroot
+- Resolves: #1696716
+
+* Tue Jul 23 2019 Matej Mužila <mmuzila@redhat.com> - 5.9.0-6
+- Fix the -l option of rlog
+  Resolves: #1696716
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 5.9.0-5
 - Mass rebuild 2014-01-24