Merge branch 'master' into el5

Conflicts:
	znc.spec

.gitignore

@@ -24,3 +24,7 @@
 /znc-1.0-alpha1.tar.gz
 /znc-1.0-beta1.tar.gz
 /znc-1.0.tar.gz
+/znc-1.2-alpha1.tar.gz
+/znc-1.2-beta1.tar.gz
+/znc-1.2-rc2.tar.gz
+/znc-1.2.tar.gz

sources

@@ -1 +1 @@
-23807ca830c27392cccb6774f542df6e  znc-1.0.tar.gz
+ef18e5402a82cc3fcab5c2ac5c2e6f3b  znc-1.2.tar.gz

znc.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Daemon to do something
+Description=ZNC - an advanced IRC bouncer
 After=network.target
 
 [Service]

znc.spec

@@ -5,18 +5,21 @@
 %define use_systemd 1
 %endif
 
+%global _hardened_build 1
+
 %global __python %{__python3}
 
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        1.0
+Version:        1.2
 #Release:        0.1.20110801git%{?dist}
-#Release:        0.2.beta1%{?dist}
-Release:        1%{?dist}
-License:        GPLv2 with exceptions
+#Release:        0.4.rc2%{?dist}
+Release:        3%{?dist}
+License:        ASL 2.0
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-1.0.tar.gz
+Source0:        http://znc.in/releases/znc-1.2.tar.gz
+Patch0:         znc-crashbug.patch
 
 %if %{use_systemd}
 Source1:        znc.service
@@ -28,7 +31,7 @@ Source1:        znc.init
 
 # git clone https://github.com/znc/znc.git
 # cd znc
-# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
+# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  gcc-c++ perl
@@ -83,8 +86,8 @@ TCL module for ZNC
 
 %prep
 %setup -q -n %{name}-%{version}
-#%setup -q -n znc-1.0-beta1
-#%patch0 -p1
+#%setup -q -n znc-1.2-rc2
+%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -123,10 +126,7 @@ install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/znc
 %post
 
 %if %{use_systemd}
-if [ $1 -eq 1 ] ; then
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post znc.service
 %endif
 
 %if !%{use_systemd}
@@ -137,11 +137,7 @@ fi
 %postun
 
 %if %{use_systemd}
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart znc.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart znc.service
 %endif
 
 %if !%{use_systemd}
@@ -153,11 +149,7 @@ fi
 %preun
 
 %if %{use_systemd}
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable znc.service > /dev/null 2>&1 || :
-    /bin/systemctl stop znc.service > /dev/null 2>&1 || :
-fi
+%systemd_preun znc.service
 %endif
 
 %if !%{use_systemd}
@@ -169,7 +161,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README.md
+%doc AUTHORS LICENSE README.md
 %{_bindir}/znc
 %{_mandir}/man1/*
 %{_libdir}/znc/adminlog.so
@@ -206,6 +198,7 @@ fi
 %{_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
@@ -244,6 +237,33 @@ fi
 %{_libdir}/znc/modtcl.so
 
 %changelog
+* Mon Apr 14 2014 Nick Bebout <nb@fedoraproject.org> - 1.2-3
+- Fix potential crash bug when adding channels
+
+* Mon Nov 11 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-2
+- Enable PIE, Fix systemd description, use systemd macros
+
+* Mon Nov 11 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-1
+- Upgrade to 1.2
+
+* Fri Oct 25 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.4.rc2
+- Upgrade to 1.2-rc2
+
+* Thu Sep 26 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.3.beta1
+- Upgrade to 1.2-beta1
+
+* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 1.2-0.2.alpha1
+- Perl 5.18 rebuild
+
+* Sun Jul 28 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.1.alpha1
+- Upgrade to 1.2-alpha1
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.0-3
+- Perl 5.18 rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Nov 13 2012 Nick Bebout <nb@fedoraproject.org> - 1.0-1
 - Update to 1.0