From 444afd734825e3cf39252bf485dd5f48b24c5984 Mon Sep 17 00:00:00 2001
From: Eduarod Echeverria <echevemaster@gmai.com>
Date: Mar 29 2020 21:55:45 +0000
Subject: Upgrade to 1.3


---

diff --git a/.gitignore b/.gitignore
index 7040ca4..e709b5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /goaccess-1.0.2.tar.gz
 /goaccess-1.1.1.tar.gz
 /goaccess-1.2.tar.gz
+/goaccess-1.3.tar.gz
diff --git a/goaccess.spec b/goaccess.spec
index fba3a80..8aa0c8e 100644
--- a/goaccess.spec
+++ b/goaccess.spec
@@ -1,10 +1,24 @@
+%bcond_without lto
+		
+%bcond_without tcb_memhash
+	
+%bcond_with tcb_btree
+		
+%bcond_without openssl
+		
+%if %{with lto}	
+%global optflags        %{optflags} -flto
+%global build_ldflags   %{build_ldflags} -flto
+%endif
+
 Name:           goaccess
-Version:        1.2
-Release:        8%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Real-time web log analyzer and interactive viewer
 License:        GPLv2+
 URL:            https://goaccess.io/
 Source0:        http://tar.goaccess.io/%{name}-%{version}.tar.gz
+Patch1:         patch.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -13,6 +27,10 @@ BuildRequires:  ncurses-devel
 BuildRequires:  tokyocabinet-devel
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
+BuildRequires:	gettext-devel
+%if %{with openssl}	
+BuildRequires:  openssl-devel	
+%endif
 
 %description
 GoAccess is a real-time web log analyzer and interactive viewer that runs in a
@@ -54,27 +72,39 @@ not limited to:
 * W3C format (IIS).
 
 %prep
-%setup -q
+%autosetup -p1
 # Prevent flags being overridden again and again.
 #sed -i 's|-pthread|$CFLAGS \0|' configure.ac
 sed -i '/-pthread/d' configure.ac
 
 %build
-autoreconf -fiv
-%configure --enable-debug --enable-geoip --enable-utf8 --enable-tcb=btree --with-getline
+# autoreconf -fiv
+# %configure --enable-debug --enable-geoip --enable-utf8 --enable-tcb=btree --with-getline
+%configure \
+	--enable-debug \
+	--enable-geoip=legacy \
+	%{?with_tcb_memhash: --enable-tcb=memhash} \
+	%{?with_tcb_btree: --enable-tcb=btree} \
+	--enable-utf8 \
+	--with-getline \
+	 %{?with_openssl: --with-openssl}
 %make_build
 
 %install
 %make_install
+%find_lang %{name}
 
-%files
+%files -f %{name}.lang
 %license COPYING
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/browsers.list
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%{_pkgdocdir}
 
 %changelog
+* Sun Mar 29 2020 Eduardo Echeverria <echevemaster@gmail.com> - 1.3-1
+- Upgrade version to 1.3, thanks elxreno@gmail.com
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/patch.diff b/patch.diff
new file mode 100644
index 0000000..17ba97f
--- /dev/null
+++ b/patch.diff
@@ -0,0 +1,26 @@
+diff --git a/src/commons.h b/src/commons.h
+index 6bdf88be..8751de38 100644
+--- a/src/commons.h
++++ b/src/commons.h
+@@ -44,7 +44,7 @@
+ #define GO_UNUSED __attribute__((unused))
+ #define GO_VERSION 		"1.3"
+ #define GO_WEBSITE 		"http://goaccess.io/"
+-struct tm *now_tm;
++extern struct tm *now_tm;
+ 
+ /* common char array buffer size */
+ #define INIT_BUF_SIZE 1024
+diff --git a/src/csv.c b/src/csv.c
+index fefaa0e0..9ef74c85 100644
+--- a/src/csv.c
++++ b/src/csv.c
+@@ -55,6 +55,8 @@
+ #include "ui.h"
+ #include "util.h"
+ 
++struct tm *now_tm;
++
+ /* Panel output */
+ typedef struct GPanel_
+ {
diff --git a/sources b/sources
index aeac008..94aaae2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (goaccess-1.2.tar.gz) = bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
+SHA512 (goaccess-1.3.tar.gz) = 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1