From 2c25631517c734edbf596c271dcf7c3cfc8d7f7c Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Tue, 15 May 2018 14:24:52 +0100
Subject: [PATCH 1/3] Rebuild for ICU 61.1

---
 znc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/znc.spec b/znc.spec
index ae5617a..c5d9986 100644
--- a/znc.spec
+++ b/znc.spec
@@ -13,7 +13,7 @@
 
 Name:           znc
 Version:        1.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An advanced IRC bouncer
 Group:          System Environment/Daemons
 
@@ -198,6 +198,9 @@ getent passwd znc >/dev/null || \
 
 
 %changelog
+* Tue May 15 2018 Pete Walter <pwalter@fedoraproject.org> - 1.7.0-2
+- Rebuild for ICU 61.1
+
 * Wed May 2 2018 Nick Bebout <nb@usi.edu> - 1.7.0-1
 - Update to 1.7.0
 

From ab1e6679f6b120cacfaa99b329f2bfab1f119588 Mon Sep 17 00:00:00 2001
From: Nick Bebout <nebebout@36WTHB2.usi.edu>
Date: Fri, 18 May 2018 13:35:47 -0500
Subject: [PATCH 2/3] Revert "Update to 1.7.0"

This reverts commit dcd546a2a9a1bd944c5ffcc1a21f8150fb8b2919.
---
 .gitignore |  1 -
 sources    |  2 +-
 znc.spec   | 65 ++++++++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f47d7e6..8d89908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,3 @@
 /znc-1.6.4.tar.gz
 /znc-1.6.5.tar.gz
 /znc-1.6.6.tar.gz
-/znc-1.7.0.tar.gz
diff --git a/sources b/sources
index c1e0886..593ede6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (znc-1.7.0.tar.gz) = 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
+SHA512 (znc-1.6.6.tar.gz) = cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
diff --git a/znc.spec b/znc.spec
index ae5617a..f2f3787 100644
--- a/znc.spec
+++ b/znc.spec
@@ -12,8 +12,8 @@
 %endif # 0%{?fedora} || 0%{?rhel} >= 7
 
 Name:           znc
-Version:        1.7.0
-Release:        1%{?dist}
+Version:        1.6.6
+Release:        2%{?dist}
 Summary:        An advanced IRC bouncer
 Group:          System Environment/Daemons
 
@@ -138,8 +138,10 @@ chmod -x modules/q.cpp
 %endif # 0%{?rhel} && 0%{?rhel} <= 5
 %__make install DESTDIR="%{buildroot}"
 mkdir -p %buildroot%{_unitdir}
+#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service
 install -d "%{buildroot}%{_sharedstatedir}/znc"
 
+
 %if 0%{?rhel} && 0%{?rhel} <= 5
 %clean
 %__rm -Rf "%{buildroot}"
@@ -166,11 +168,63 @@ getent passwd znc >/dev/null || \
 
 
 %files
-%doc LICENSE README.md
+%doc AUTHORS LICENSE README.md
 %{_bindir}/znc
 %{_mandir}/man1/*
 %dir %{_libdir}/znc
-%{_libdir}/znc/*
+%{_libdir}/znc/adminlog.so
+%{_libdir}/znc/alias.so
+%{_libdir}/znc/autoattach.so
+%{_libdir}/znc/autocycle.so
+%{_libdir}/znc/autoop.so
+%{_libdir}/znc/autoreply.so
+%{_libdir}/znc/autovoice.so
+%{_libdir}/znc/awaynick.so
+%{_libdir}/znc/awaystore.so
+%{_libdir}/znc/block_motd.so
+%{_libdir}/znc/blockuser.so
+%{_libdir}/znc/bouncedcc.so
+%{_libdir}/znc/buffextras.so
+%{_libdir}/znc/cert.so
+%{_libdir}/znc/certauth.so
+%{_libdir}/znc/chansaver.so
+%{_libdir}/znc/clearbufferonmsg.so
+%{_libdir}/znc/clientnotify.so
+%{_libdir}/znc/controlpanel.so
+%{_libdir}/znc/crypt.so
+%{_libdir}/znc/ctcpflood.so
+%{_libdir}/znc/cyrusauth.so
+%{_libdir}/znc/dcc.so
+%{_libdir}/znc/disconkick.so
+%{_libdir}/znc/fail2ban.so
+%{_libdir}/znc/flooddetach.so
+%{_libdir}/znc/identfile.so
+%{_libdir}/znc/imapauth.so
+%{_libdir}/znc/keepnick.so
+%{_libdir}/znc/kickrejoin.so
+%{_libdir}/znc/lastseen.so
+%{_libdir}/znc/listsockets.so
+%{_libdir}/znc/log.so
+%{_libdir}/znc/missingmotd.so
+%{_libdir}/znc/modules_online.so
+%{_libdir}/znc/nickserv.so
+%{_libdir}/znc/notes.so
+%{_libdir}/znc/notify_connect.so
+%{_libdir}/znc/partyline.so
+%{_libdir}/znc/perform.so
+%{_libdir}/znc/q.so
+%{_libdir}/znc/raw.so
+%{_libdir}/znc/route_replies.so
+%{_libdir}/znc/sample.so
+%{_libdir}/znc/sasl.so
+%{_libdir}/znc/savebuff.so
+%{_libdir}/znc/schat.so
+%{_libdir}/znc/send_raw.so
+%{_libdir}/znc/shell.so
+%{_libdir}/znc/simple_away.so
+%{_libdir}/znc/stickychan.so
+%{_libdir}/znc/watch.so
+%{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
 %{_unitdir}/znc.service
 %attr(-,znc,znc) %{_sharedstatedir}/znc/
@@ -198,9 +252,6 @@ getent passwd znc >/dev/null || \
 
 
 %changelog
-* Wed May 2 2018 Nick Bebout <nb@usi.edu> - 1.7.0-1
-- Update to 1.7.0
-
 * Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 1.6.6-2
 - Rebuild for ICU 61.1
 

From c4ebcd526b31a150eb92c5ecf9bffe7ea4c0cdff Mon Sep 17 00:00:00 2001
From: Nick Bebout <nebebout@36WTHB2.usi.edu>
Date: Fri, 18 May 2018 14:35:05 -0500
Subject: [PATCH 3/3] Fix %files to not use wildcard

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

diff --git a/.gitignore b/.gitignore
index 8d89908..f47d7e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /znc-1.6.4.tar.gz
 /znc-1.6.5.tar.gz
 /znc-1.6.6.tar.gz
+/znc-1.7.0.tar.gz
diff --git a/sources b/sources
index 593ede6..c1e0886 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (znc-1.6.6.tar.gz) = cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
+SHA512 (znc-1.7.0.tar.gz) = 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
diff --git a/znc.spec b/znc.spec
index f2f3787..445167f 100644
--- a/znc.spec
+++ b/znc.spec
@@ -12,7 +12,7 @@
 %endif # 0%{?fedora} || 0%{?rhel} >= 7
 
 Name:           znc
-Version:        1.6.6
+Version:        1.7.0
 Release:        2%{?dist}
 Summary:        An advanced IRC bouncer
 Group:          System Environment/Daemons
@@ -168,7 +168,7 @@ getent passwd znc >/dev/null || \
 
 
 %files
-%doc AUTHORS LICENSE README.md
+%doc LICENSE README.md
 %{_bindir}/znc
 %{_mandir}/man1/*
 %dir %{_libdir}/znc
@@ -216,6 +216,7 @@ getent passwd znc >/dev/null || \
 %{_libdir}/znc/raw.so
 %{_libdir}/znc/route_replies.so
 %{_libdir}/znc/sample.so
+%{_libdir}/znc/samplewebapi.so
 %{_libdir}/znc/sasl.so
 %{_libdir}/znc/savebuff.so
 %{_libdir}/znc/schat.so
@@ -223,6 +224,7 @@ getent passwd znc >/dev/null || \
 %{_libdir}/znc/shell.so
 %{_libdir}/znc/simple_away.so
 %{_libdir}/znc/stickychan.so
+%{_libdir}/znc/stripcontrols.so
 %{_libdir}/znc/watch.so
 %{_libdir}/znc/webadmin.so
 %{_datadir}/znc/
@@ -248,10 +250,15 @@ getent passwd znc >/dev/null || \
 %files modpython
 %{_libdir}/znc/modpython/
 %{_libdir}/znc/modpython.so
+%{_libdir}/znc/pyeval.py
+%{_libdir}/znc/__pycache__/
 %endif # 0%{?with_modpython}
 
 
 %changelog
+* Fri May 18 2018 Nick Bebout <nb@usi.edu> - 1.7.0-1
+- Update to 1.7.0
+
 * Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 1.6.6-2
 - Rebuild for ICU 61.1