From 7f38e1e66e57e85a591922f58b26cf7d79a47429 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 7 Jul 2020 10:25:58 +0200
Subject: [PATCH 1/3] New release - setconf 0.7.7

---
 .gitignore   | 1 +
 setconf.spec | 7 +++++--
 sources      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0a3a09..7ee3f3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /setconf-0.7.6.tar.gz
+/setconf-0.7.7.tar.gz
diff --git a/setconf.spec b/setconf.spec
index cf2b696..0d88725 100644
--- a/setconf.spec
+++ b/setconf.spec
@@ -1,6 +1,6 @@
 Name:           setconf
-Version:        0.7.6 
-Release:        2%{?dist}
+Version:        0.7.7
+Release:        1%{?dist}
 Summary:        Utility for changing settings in configuration text files 
 
 License:        GPLv2
@@ -44,6 +44,9 @@ cd testcases/ && ./py3_test.sh
 %{_bindir}/%{name}
 
 %changelog
+* Tue Jul 07 2020 Jan Macku <jamacku@redhat.com> - 0.7.7-1
+- New release - setconf 0.7.7
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index ca83bf2..1e5d72e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setconf-0.7.6.tar.gz) = 994414dd38b087bd7bc3fb6e1143617dcab3e24f5b12c8352c2b9076502534be860b749804fa1367a1412073e79b1b4f23a2a547c0706c27041742d39b2eb5ac
+SHA512 (setconf-0.7.7.tar.gz) = 5ada31bbf7abcaf69b0c7759bfb624b985e6482762e84a5eeeac3d3ed022fd88cd4440ebf53454839cf974370df85f73ac1a74ee9b9144c84d4763f537d0f96f

From c89c3130b81b0d2f4d40a745b4e6188ccba61fe9 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 7 Jul 2020 10:45:14 +0200
Subject: [PATCH 2/3] Fix names of patches in spec

---
 setconf.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/setconf.spec b/setconf.spec
index 0d88725..e817dc9 100644
--- a/setconf.spec
+++ b/setconf.spec
@@ -1,14 +1,15 @@
 Name:           setconf
 Version:        0.7.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utility for changing settings in configuration text files 
 
 License:        GPLv2
 URL:            http://setconf.roboticoverlords.org/ 
 Source0:        https://github.com/xyproto/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
-Patch0:         %{name}-%{version}-rm_sb.patch
-Patch1:         %{name}-%{version}-add_man.patch
+# Patch#:       setconf-version-description.patch
+Patch0:         setconf-0.7.6-rm_sb.patch
+Patch1:         setconf-0.7.6-add_man.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -44,6 +45,9 @@ cd testcases/ && ./py3_test.sh
 %{_bindir}/%{name}
 
 %changelog
+* Tue Jul 07 2020 Jan Macku <jamacku@redhat.com> - 0.7.7-2
+- Fix names of patches in spec
+
 * Tue Jul 07 2020 Jan Macku <jamacku@redhat.com> - 0.7.7-1
 - New release - setconf 0.7.7
 

From be6af5a09f4930fc705cddaa3a342ffe827f0460 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 7 Jul 2020 11:28:14 +0200
Subject: [PATCH 3/3] Fix Patch1 to match new source formating

---
 setconf-0.7.6-add_man.patch | 15 ---------------
 setconf-0.7.7-add_man.patch | 18 ++++++++++++++++++
 setconf.spec                |  7 +++++--
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 setconf-0.7.6-add_man.patch
 create mode 100644 setconf-0.7.7-add_man.patch

diff --git a/setconf-0.7.6-add_man.patch b/setconf-0.7.6-add_man.patch
deleted file mode 100644
index 9e23b99..0000000
--- a/setconf-0.7.6-add_man.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index dcf28bc..2607b2b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -12,6 +12,7 @@ setup(name="setconf",
-       author_email="xyproto@archlinux.org",
-       license="GPLv2",
-       py_modules=["setconf"],
-+      data_files = [('share/man/man1', ['./setconf.1'])],
-       entry_points={
-         "console_scripts" : [
-             "setconf = setconf:main",
--- 
-2.20.1
-
diff --git a/setconf-0.7.7-add_man.patch b/setconf-0.7.7-add_man.patch
new file mode 100644
index 0000000..07e3c86
--- /dev/null
+++ b/setconf-0.7.7-add_man.patch
@@ -0,0 +1,18 @@
+From: Jan Macku <jamacku@redhat.com>
+Date: Tue, 7 Jul 2020 11:12:27 +0200
+Subject: [PATCH] setconf-0.7.7-add_man.patch
+diff --git a/setup.py b/setup.py
+index 7d2423a..218ec28 100644
+--- a/setup.py
++++ b/setup.py
+@@ -12,6 +12,7 @@ setup(name="setconf",
+       author_email="xyproto@archlinux.org",
+       license="GPLv2",
+       py_modules=["setconf"],
++      data_files = [("share/man/man1", ["./setconf.1"])],
+       entry_points={
+           "console_scripts": [
+               "setconf = setconf:main",
+-- 
+2.25.4
+
diff --git a/setconf.spec b/setconf.spec
index e817dc9..1c95ed6 100644
--- a/setconf.spec
+++ b/setconf.spec
@@ -1,6 +1,6 @@
 Name:           setconf
 Version:        0.7.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility for changing settings in configuration text files 
 
 License:        GPLv2
@@ -9,7 +9,7 @@ Source0:        https://github.com/xyproto/%{name}/archive/%{version}/%{name}-%{
 
 # Patch#:       setconf-version-description.patch
 Patch0:         setconf-0.7.6-rm_sb.patch
-Patch1:         setconf-0.7.6-add_man.patch
+Patch2:         setconf-0.7.7-add_man.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -45,6 +45,9 @@ cd testcases/ && ./py3_test.sh
 %{_bindir}/%{name}
 
 %changelog
+* Tue Jul 07 2020 Jan Macku <jamacku@redhat.com> - 0.7.7-3
+- Fix Patch1 to match new source formating
+
 * Tue Jul 07 2020 Jan Macku <jamacku@redhat.com> - 0.7.7-2
 - Fix names of patches in spec