PR#2: Update to 1.4 - rpms/goaccess - src.fedoraproject.org

		`@@ -1,35 +1,27 @@`
		`%bcond_without lto`
		`-`
		`- %bcond_without tcb_memhash`
		`-`
		`- %bcond_with tcb_btree`
		`-`
		`+`
		`%bcond_without openssl`
		`-`
		`- %if %{with lto}`
		`+`
		`+ %if %{with lto}`
		`%global optflags %{optflags} -flto`
		`%global build_ldflags %{build_ldflags} -flto`
		`%endif`

		`Name: goaccess`
		`- Version: 1.3`
		`- Release: 3%{?dist}`
		`+ Version: 1.4.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`
		`+ Source0: https://tar.goaccess.io/%{name}-%{version}.tar.gz`
		`BuildRequires: autoconf`
		`BuildRequires: automake`
		`BuildRequires: gcc`
		`BuildRequires: GeoIP-devel`
		`BuildRequires: ncurses-devel`
		`- BuildRequires: tokyocabinet-devel`
		`- BuildRequires: zlib-devel`
		`- BuildRequires: bzip2-devel`
		`- BuildRequires: gettext-devel`
		`- %if %{with openssl}`
		`- BuildRequires: openssl-devel`
		`+ BuildRequires: gettext-devel`
		`+ %if %{with openssl}`
		`+ BuildRequires: openssl-devel`
		`%endif`

		`%description`
		`@@ -41,7 +33,7 @@`
		`GoAccess parses the specified web log file and outputs the data to terminal.`

		`* General statistics, bandwidth, etc.`
		`- * Time taken to serve the request (useful to track pages that are slowing down.`
		`+ * Time taken to serve the request (useful to track pages that are slowing down`
		`your site).`
		`* Metrics for cumulative, average and slowest running requests.`
		`* Top visitors.`
		`@@ -72,22 +64,20 @@`
		`* W3C format (IIS).`

		`%prep`
		`- %autosetup -p1`
		`+ %autosetup`
		`# 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`
		`+ # %%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}`
		`+ --enable-debug \`
		`+ --enable-geoip=legacy \`
		`+ --enable-utf8 \`
		`+ --with-getline \`
		`+ %{?with_openssl: --with-openssl}`
		`%make_build`

		`%install`
		`@@ -98,6 +88,7 @@`
		`%license COPYING`
		`%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf`
		`%config(noreplace) %{_sysconfdir}/%{name}/browsers.list`
		`+ %config(noreplace) %{_sysconfdir}/%{name}/podcast.list`
		`%{_bindir}/%{name}`
		`%{_mandir}/man1/%{name}.1*`

patch.diff

file removed

-26

		`@@ -1,26 +0,0 @@`
		`- 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_`
		`- {`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (goaccess-1.3.tar.gz) = 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1`
		`+ SHA512 (goaccess-1.4.3.tar.gz) = 8f5cbd6d9aca9fdb9310a969b0e8ae86a388a2d82d35a120a56a8d81597c163d8df6b27465ade400492c7edd50b3a73192154e8f8243f782421997fac36bc50a`

losuler commented 3 years ago

Included in this pull request:

Updated Version to 1.4
Added HTTPS for source archive url
Removed tokyocabinet build dependency
- Removed in https://github.com/allinurl/goaccess/commit/d7ebd9d589f008559cac1392ca8f049106f9a575
Removed patch for GCC 10 as it's been merged upstream in 1.4
- Merged in https://github.com/allinurl/goaccess/commit/186070cfe03e3001743176d71db3f2930a88098e
Added file check for podcast list
- Added in https://github.com/allinurl/goaccess/commit/6b0fd9ed297a7f1f3e26154b5f2a753ee8c0ed7b
Added escape character for macro in comment
- This was needed because macros are expanded everywhere including in comments and as result configure is actually ran twice. For example you can see this occuring in line 69 and line 261 of the build.log for fc33 (https://kojipkgs.fedoraproject.org//packages/goaccess/1.3/1.fc33/data/logs/x86_64/build.log).
Fixed grammar mistake in description
Removed unused patch file
Fixed rpmlint mixed-use-of-spaces-and-tabs

Not included in this pull request (for the epel7 branch):

Fixed aclocal missing build error (uncommenting autoreconf -fiv)
- This is caused by the sed on configure.ac, but for some reason only causes the epel7 build to fail.
Removed unused source file (deleting goaccess-1.0.2.tar.gz)