From 18054831f2841ca3793c562b9e411d6115b716c2 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 17 Sep 2021 14:37:31 +0200
Subject: [PATCH] Resolves: #2001467 - reflect review comments from Fedora
 Review

---
 tree-license-fsf-addr.patch | 34 ++++++++++++++++++++++++++++++++++
 tree-pkg.spec               | 22 +++++++++++++++++++---
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 tree-license-fsf-addr.patch

diff --git a/tree-license-fsf-addr.patch b/tree-license-fsf-addr.patch
new file mode 100644
index 0000000..9daa0fc
--- /dev/null
+++ b/tree-license-fsf-addr.patch
@@ -0,0 +1,34 @@
+From cbfbad2607e99dc856ff82394a19ef489b135351 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 20 Sep 2021 09:36:04 +0200
+Subject: [PATCH] tree: use correct FSF address in LICENSE
+
+---
+ LICENSE | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/LICENSE b/LICENSE
+index 5b6e7c6..3c9f912 100644
+--- a/LICENSE
++++ b/LICENSE
+@@ -2,7 +2,7 @@
+ 		       Version 2, June 1991
+ 
+  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
+ 
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+ 
+ Also add information on how to contact you by electronic and paper mail.
+-- 
+2.31.1
+
diff --git a/tree-pkg.spec b/tree-pkg.spec
index bf818ac..fbb488a 100644
--- a/tree-pkg.spec
+++ b/tree-pkg.spec
@@ -1,28 +1,40 @@
 Summary: File system tree viewer
 Name: tree-pkg
 Version: 1.8.0
-Release: 8%{?dist}
-License: GPLv2+
+Release: 9%{?dist}
+
+# The entire source code is GPLv2+ except strverscmp.c which is LGPLv2+
+License: GPLv2+ and LGPLv2+
+
 URL: http://mama.indstate.edu/users/ice/tree/
 Source: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
 
 BuildRequires: gcc
 BuildRequires: make
 
+# prevent rpmlint from reporting incorrect-fsf-address
+# Sent upstream via email 20210920
+Patch0: tree-license-fsf-addr.patch
+
 # Preserve timestamp on man page.
+# Sent upstream via email 20210920
 Patch2: tree-preserve-timestamps.patch
 
 # Document --du and --prune options in help output (bug #948991).
+# Sent upstream via email 20210920
 Patch4: tree-args.patch
 
 # Use correct default for dircolors "ec" field (bug #812934).
+# Sent upstream via email 20210920
 Patch6: tree-dircolors-ec.patch
 
 # Keep file size field length constant regardless of whether SI units
 # are used (bug #997937).
+# Sent upstream via email 20210920
 Patch7: tree-size-field-len.patch
 
 # fix programming mistakes detected by static analysis
+# Sent upstream via email 20181106
 Patch8: tree-static-analysis.patch
 
 %description
@@ -58,9 +70,13 @@ chmod -x $RPM_BUILD_ROOT%{_mandir}/man1/tree.1
 %files -n tree
 %{_bindir}/tree
 %{_mandir}/man1/tree.1*
-%doc README LICENSE
+%license LICENSE
+%doc README
 
 %changelog
+* Fri Sep 17 2021 Kamil Dudka <kdudka@redhat.com> - 1.8.0-9
+- reflect review comments from Fedora Review (#2001467)
+
 * Fri Sep 03 2021 Kamil Dudka <kdudka@redhat.com> - 1.8.0-8
 - source package renamed to tree-pkg to make it work with Pagure and Gitlab