update to v1.2.14

3 files changed, 11 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 346c5e6ab047..e062ff5b200a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Dec  8 01:14:23 UTC 2017
 pkgbase = libzlog
 	pkgdesc = a reliable pure C logging library
-	pkgver = 1.2.12
-	pkgrel = 3
+	pkgver = 1.2.14
+	pkgrel = 1
 	url = http://hardysimpson.github.com/zlog
 	arch = i686
 	arch = x86_64
@@ -12,11 +10,8 @@ pkgbase = libzlog
 	makedepends = texlive-bin
 	makedepends = hevea
 	depends = glibc
-	options = !buildflags
-	source = https://github.com/HardySimpson/zlog/archive/1.2.12.tar.gz
-	source = src-makefile.patch
-	md5sums = ae9b7ede5cf3a62c3092bacf37f70de4
-	md5sums = 69098be923a08e9773fc07ee24ad2787
+	source = https://github.com/HardySimpson/zlog/archive/1.2.14.tar.gz
+	md5sums = fd277b54669848bceecd4fd6251109b4
 
 pkgname = libzlog
 
diff --git a/PKGBUILD b/PKGBUILD
index 067787c003ad..81adbd80dd9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,16 @@
 # Maintainer:  Alexej Magura <amagura28@gmail.com>
 pkgname=libzlog
 _realname=zlog
-pkgver=1.2.12
-pkgrel=3
+pkgver=1.2.14
+pkgrel=1
 pkgdesc="a reliable pure C logging library"
 arch=('i686' 'x86_64')
 url="http://hardysimpson.github.com/zlog"
 license=('LGPL')
 depends=(glibc)
 makedepends=(lyx texlive-bin hevea)
-options=(!buildflags)
-source=("https://github.com/HardySimpson/$_realname/archive/$pkgver.tar.gz"
-	"src-makefile.patch"
-       )
-md5sums=('ae9b7ede5cf3a62c3092bacf37f70de4'
-         '69098be923a08e9773fc07ee24ad2787')
-
-prepare()
-{
-  cd "$srcdir/$_realname-$pkgver"
-  patch -p0 < "$srcdir/src-makefile.patch"
-}
+source=("https://github.com/HardySimpson/$_realname/archive/$pkgver.tar.gz")
+md5sums=('fd277b54669848bceecd4fd6251109b4')
 
 build()
 {
@@ -39,9 +29,8 @@ package()
   install -d "$pkgdir/usr/share/$pkgname/doc"
 
   rename mence mance doc/per*.txt # performence.txt is misspelled: this corrects it.
-  cp doc/UsersGuide-EN.html doc/Guide.html
-  cp doc/GettingStart-EN.txt doc/README
-
-  install -t "$pkgdir/usr/share/$pkgname/doc" doc/Guide.html doc/README doc/zlog.conf doc/performance.txt
+  install -t "$pkgdir/usr/share/$pkgname/doc" "doc/"*
+  rm "$pkgdir/usr/share/$pkgname/doc/makefile"
+  rm "$pkgdir/usr/share/$pkgname/doc/"*.lyx
 }
 # vim:set ts=2 sw=2 et:
diff --git a/src-makefile.patch b/src-makefile.patch
deleted file mode 100644
index 0950a859b043..000000000000
--- a/src-makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- src/makefile	2013-09-25 05:38:42.000000000 -0600
-+++ src/makefile.new	2017-12-07 17:25:32.723333335 -0700
-@@ -27,12 +27,12 @@
- LIBNAME=libzlog
- 
- ZLOG_MAJOR=1
--ZLOG_MINOR=1
-+ZLOG_MINOR=2
- 
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- OPTIMIZATION?=-O2
--WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv
-+WARNINGS=-Wall -Wstrict-prototypes -fwrapv
- DEBUG?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG)
- REAL_LDFLAGS=$(LDFLAGS) -pthread
-@@ -46,6 +46,15 @@
- STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
- STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
- 
-+# Installation related variables
-+PREFIX?=/usr/local
-+INCLUDE_PATH=include
-+LIBRARY_PATH=lib
-+BINARY_PATH=bin
-+INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
-+INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
-+INSTALL_BINARY_PATH=  $(PREFIX)/$(BINARY_PATH)
-+
- # Platform-specific overrides
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- ifeq ($(uname_S),SunOS)
-@@ -55,9 +64,9 @@
- endif
- ifeq ($(uname_S),Darwin)
-   DYLIBSUFFIX=dylib
--  DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX)
--  DYLIB_MAJOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(DYLIBSUFFIX)
--  DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
-+  DYLIB_MINOR_NAME=$(LIBNAME).$(ZLOG_MAJOR).$(ZLOG_MINOR).$(DYLIBSUFFIX)
-+  DYLIB_MAJOR_NAME=$(LIBNAME).$(ZLOG_MAJOR).$(DYLIBSUFFIX)
-+  DYLIB_MAKE_CMD=$(CC) -dynamiclib -install_name $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
- endif
- 
- ifeq ($(uname_S),AIX)
-@@ -145,12 +154,7 @@
- dep:
- 	$(CC) -MM *.c
- 
--# Installation related variables and target
--PREFIX?=/usr/local
--INCLUDE_PATH?=include
--LIBRARY_PATH?=lib
--INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
--INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
-+# Installation target
- 
- ifeq ($(uname_S),SunOS)
-   INSTALL?= cp -r
-@@ -164,8 +168,9 @@
- INSTALL?= cp -a
- 
- install: $(DYLIBNAME) $(STLIBNAME)
--	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-+	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) $(INSTALL_BINARY_PATH)
- 	$(INSTALL) zlog.h $(INSTALL_INCLUDE_PATH)
-+	$(INSTALL) zlog-chk-conf $(INSTALL_BINARY_PATH)
- 	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
- 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
- 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)