Update to 1.54

3 files changed, 6 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a40cf7f974ee..93d1df4a7cb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cvs-fast-export
 	pkgdesc = Export RCS or CVS history as a fastimport stream.
-	pkgver = 1.49
+	pkgver = 1.54
 	pkgrel = 1
 	url = http://www.catb.org/esr/cvs-fast-export/
 	arch = i686
@@ -8,10 +8,8 @@ pkgbase = cvs-fast-export
 	license = GPL2
 	makedepends = asciidoc
 	depends = python
-	source = https://gitlab.com/esr/cvs-fast-export/-/archive/1.49/cvs-fast-export-1.49.tar.gz
-	source = 0001-Makefile-cflags-and-destdir.patch
-	sha512sums = 4e729c564800ed364b6d1bae8ffc2144e508e1a24677f5ab082843ce9d4263ea2ec80facbe0d1fdf59aabae6c4bf7cba30350517458400c98545a6853ad49f31
-	sha512sums = 49c0a9fbe187a07dce9c5c7636aa7e48eaeff56fff9afb5f4e4e9930873a3bddccad112d0c05e8827a3c9bc1ece4867ace5682979762a0469c0774c2b195f93b
+	source = https://gitlab.com/esr/cvs-fast-export/-/archive/1.54/cvs-fast-export-1.54.tar.gz
+	b2sums = e2ac2d6e91ef0f0aab30aa02b5967183a5673c7ffcb28027e3db74bffbf35c3002921098d4c3b67a704809450b6cda10141cb04dd052f627748da1cb669af73e
 
 pkgname = cvs-fast-export
 
diff --git a/0001-Makefile-cflags-and-destdir.patch b/0001-Makefile-cflags-and-destdir.patch
deleted file mode 100644
index f356c6d22771..000000000000
--- a/0001-Makefile-cflags-and-destdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2cca402..86f4c4e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,7 +25,7 @@ target=$(DESTDIR)$(prefix)
- parsedir:=$(.PARSEDIR)
- srcdir=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))$(parsedir)
- VPATH=$(srcdir)
--mandir?=$(prefix)/share/man
-+mandir?=$(DESTDIR)$(prefix)/share/man
- 
- INSTALL = install
- TAR = tar
-@@ -34,7 +34,7 @@ GCC_WARNINGS1=-Wall -Wpointer-arith -Wstrict-prototypes
- GCC_WARNINGS2=-Wmissing-prototypes -Wmissing-declarations
- GCC_WARNINGS3=-Wno-unused-function -Wno-unused-label -Wno-format-zero-length
- GCC_WARNINGS=$(GCC_WARNINGS1) $(GCC_WARNINGS2) $(GCC_WARNINGS3)
--CFLAGS=$(GCC_WARNINGS)
-+CFLAGS+=$(GCC_WARNINGS)
- CPPFLAGS += -I. -I$(srcdir)
- #LIBS=-lrt
- CPPFLAGS += -DVERSION=\"$(VERSION)\"
-@@ -44,7 +44,7 @@ CFLAGS += -pthread
- CPPFLAGS += -DTHREADS
- 
- # Optimizing for speed. Comment this out for distribution builds
--CFLAGS += -march=native
-+# CFLAGS += -march=native
- 
- # To enable debugging of the Yacc grammar, uncomment the following line
- #CPPFLAGS += -DYYDEBUG=1
-@@ -78,7 +78,7 @@ CPPFLAGS+=-Drestrict=__restrict__
- # CFLAGS += -pg
- # Warning: Using -O3 has been seen to cause core dumps on repositories with
- # very long revision names - some bounds check gets optimized away. Don't do that.
--CFLAGS += -O2
-+# CFLAGS += -O2
- # If your toolchain supports link time optimization this is a cheap speedup
- # CFLAGS += -flto
- # CFLAGS += -g
diff --git a/PKGBUILD b/PKGBUILD
index 996e3e4183a4..469a093a30c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
 
 pkgname=cvs-fast-export
-pkgver=1.49
+pkgver=1.54
 pkgrel=1
 pkgdesc="Export RCS or CVS history as a fastimport stream."
 arch=('i686' 'x86_64')
@@ -9,10 +9,8 @@ depends=('python')
 makedepends=('asciidoc')
 url="http://www.catb.org/esr/$pkgname/"
 license=('GPL2')
-source=("https://gitlab.com/esr/cvs-fast-export/-/archive/$pkgver/cvs-fast-export-$pkgver.tar.gz"
-        0001-Makefile-cflags-and-destdir.patch)
-sha512sums=('4e729c564800ed364b6d1bae8ffc2144e508e1a24677f5ab082843ce9d4263ea2ec80facbe0d1fdf59aabae6c4bf7cba30350517458400c98545a6853ad49f31'
-            '49c0a9fbe187a07dce9c5c7636aa7e48eaeff56fff9afb5f4e4e9930873a3bddccad112d0c05e8827a3c9bc1ece4867ace5682979762a0469c0774c2b195f93b')
+source=("https://gitlab.com/esr/cvs-fast-export/-/archive/$pkgver/cvs-fast-export-$pkgver.tar.gz")
+b2sums=('e2ac2d6e91ef0f0aab30aa02b5967183a5673c7ffcb28027e3db74bffbf35c3002921098d4c3b67a704809450b6cda10141cb04dd052f627748da1cb669af73e')
 
 prepare() {
   cd "$pkgname-$pkgver"