[iptraf-ng/f19: 9/9] fix merge

[Alejandro Perez]

commit bf07424da37395c420df6b400152469a070f87e5
Merge: c37b670 9164c81
Author: Alejandro <aeperezt at fedoraproject.org>
Date:   Mon Jun 23 21:04:31 2014 -0500

    fix merge

 0002-Makefile-add-Werror-format-security.patch |   79 ++++++++++++++++++++++++
 iptraf-ng-logrotate.conf                       |    2 +-
 iptraf-ng.spec                                 |   43 +++++++++++---
 3 files changed, 115 insertions(+), 9 deletions(-)
---
diff --cc iptraf-ng.spec
index 3b2e2ab,40edec0..956ce55
--- a/iptraf-ng.spec
+++ b/iptraf-ng.spec
@@@ -74,12 -76,31 +76,37 @@@ rm -rf %{buildroot
  %{_prefix}/lib/tmpfiles.d/%{name}.conf
  
  %changelog
- * Sun Mar 02 2014 Alejandro Pérez <aeperezt at fedoraproject.org> - 1.1.4-3
- - fix bug 1020552
+ * Tue Jun 17 2014 Alejandro Pérez  <aeperezt at fedoraproject.org> - 1.1.4-7
+ - fix 1109768
+   bad configuration logrotate
++ fix bug 1020552
 +  rpm report /var/lock/ipraf-ng is missing
 +  added iptraf-ng-tmpfiles.conf
- * Mon Sep 02 2013 Nikola Pajkovsky <npajkovs at redhat.com> - 1.1.4-2
++  9b32013 BUGFIX: fix "Floating point exception" in tcplog_flowrate_msg() (Vitezslav Samel)
++
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ * Sun Mar 02 2014 Alejandro Pérez  <aeperezt at fedoraproject.org> - 1.1.4-5
+ - fix bug 1020552
+   rpm report /var/lock/ipraf-ng is missing
+   fix dates on changelog
+   added missing file iptraf-nf-tmpfiles.conf
+ * Tue Dec 03 2013 Nikola Pajkovsky <npajkovs at redhat.com> - 1.1.4-4
+ - iptraf-ng-1.1.4-4
+ 
+   Fedora start using -Werror=format-security and iptraf-ng had some
+   parts where error compilation was trigged.
+ 
+   202b2e7b27a1 Makefile: add -Werror=format-security
+ 
+   Resolved: #1037133
+ 
+ * Mon Sep 02 2013 Nikola Pajkovsky <npajkovs at redhat.com> - 1.1.4-3
  - 9b32013 BUGFIX: fix "Floating point exception" in tcplog_flowrate_msg() (Vitezslav Samel)
+   
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
++>>>>>>> master
  
  * Tue Jul 23 2013 Nikola Pajkovsky <npajkovs at redhat.com> - 1.1.4
  - new upstream iptraf-ng-1.1.4