Update to 3.34

4 files changed, 9 insertions, 77 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8181114d4bb3..c5b45e595bd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Feb  8 10:12:28 UTC 2016
+# Wed Feb 17 01:28:58 UTC 2016
 pkgbase = reposurgeon
 	pkgdesc = Performs surgery on version control repositories.
-	pkgver = 3.33
-	pkgrel = 2
+	pkgver = 3.34
+	pkgrel = 1
 	url = http://www.catb.org/esr/reposurgeon/
 	arch = any
 	license = BSD
@@ -19,12 +19,8 @@ pkgbase = reposurgeon
 	optdepends = mercurial
 	optdepends = src
 	optdepends = subversion
-	source = http://www.catb.org/esr/reposurgeon/reposurgeon-3.33.tar.xz
-	source = 0001-Install-repocutter-along-with-the-other-tools.patch
-	source = 0002-Run-repocutter-and-repomapper-with-Python-2.patch
-	sha256sums = 88a88d8fa0f612f5efc7ba5b2ca741713d260a250ada5b1ee01029436c08b571
-	sha256sums = 700c76e85eee935f84d268b9cbec618f0cc973cee25f59aa388efac1b12343fb
-	sha256sums = d1547a1ba5a2e29859b9b1c05ac8a6bd1f96938c3c807ea94793cc734c587eb9
+	source = http://www.catb.org/esr/reposurgeon/reposurgeon-3.34.tar.xz
+	sha256sums = dfa1211bca2063cc5d28d8f8b78c0e8776250dce45b1e797d03523150c5ebe86
 
 pkgname = cyreposurgeon
 	arch = i686
diff --git a/0001-Install-repocutter-along-with-the-other-tools.patch b/0001-Install-repocutter-along-with-the-other-tools.patch
deleted file mode 100644
index bfa335bddb51..000000000000
--- a/0001-Install-repocutter-along-with-the-other-tools.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fe0c498c5a9271fba9d15e1c8227e6155e7a72a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=2E=20Alberto=20Gim=C3=A9nez?=
- <alberto.gimenez@capside.com>
-Date: Wed, 3 Feb 2016 15:36:01 +0100
-Subject: [PATCH 1/2] Install repocutter along with the other tools
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 5404af0..1af0d7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@ install: all
- 	$(INSTALL) -d "$(target)/bin"
- 	$(INSTALL) -d "$(target)/share/doc/reposurgeon"
- 	$(INSTALL) -d "$(target)/$(mandir)/man1"
--	$(INSTALL) -m 755 reposurgeon repomapper repotool repodiffer "$(target)/bin"
-+	$(INSTALL) -m 755 reposurgeon repomapper repotool repodiffer repocutter "$(target)/bin"
- 	$(INSTALL) -m 644 README.md NEWS TODO reposurgeon-git-aliases *.html \
- 		"$(target)/share/doc/reposurgeon"
- 	$(INSTALL) -m 644 *.1 "$(target)/$(mandir)/man1"
--- 
-2.7.0
-
diff --git a/0002-Run-repocutter-and-repomapper-with-Python-2.patch b/0002-Run-repocutter-and-repomapper-with-Python-2.patch
deleted file mode 100644
index 25542278c4e7..000000000000
--- a/0002-Run-repocutter-and-repomapper-with-Python-2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From eda2ef44b0f5fa4b1d73030cce1166dfbb3019e0 Mon Sep 17 00:00:00 2001
-From: Mike Swanson <mikeonthecomputer@gmail.com>
-Date: Mon, 8 Feb 2016 02:09:51 -0800
-Subject: [PATCH 2/2] Run repocutter and repomapper with Python 2
-
----
- repocutter | 2 +-
- repomapper | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/repocutter b/repocutter
-index f0d6c3d..a196c9a 100755
---- a/repocutter
-+++ b/repocutter
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Hacked together by ESR, October 2009. New BSD license applies.
- # The Subversion project is explicitly granted permission to redistribute
-diff --git a/repomapper b/repomapper
-index a3e507a..5b3033c 100755
---- a/repomapper
-+++ b/repomapper
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # SPDX-License-Identifier: BSD-2-Clause
- 
- """
--- 
-2.7.0
-
diff --git a/PKGBUILD b/PKGBUILD
index b4c6b5089b29..5eafcbd94292 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=reposurgeon
 pkgname=({cy,}reposurgeon)
-pkgver=3.33
-pkgrel=2
+pkgver=3.34
+pkgrel=1
 pkgdesc="Performs surgery on version control repositories."
 arch=('any')
 url="http://www.catb.org/esr/$pkgbase/"
@@ -18,12 +18,8 @@ optdepends=('bzr'
             'mercurial'
             'src'
             'subversion')
-source=("$url$pkgbase-$pkgver.tar.xz"
-        0001-Install-repocutter-along-with-the-other-tools.patch
-        0002-Run-repocutter-and-repomapper-with-Python-2.patch)
-sha256sums=('88a88d8fa0f612f5efc7ba5b2ca741713d260a250ada5b1ee01029436c08b571'
-            '700c76e85eee935f84d268b9cbec618f0cc973cee25f59aa388efac1b12343fb'
-            'd1547a1ba5a2e29859b9b1c05ac8a6bd1f96938c3c807ea94793cc734c587eb9')
+source=("$url$pkgbase-$pkgver.tar.xz")
+sha256sums=('dfa1211bca2063cc5d28d8f8b78c0e8776250dce45b1e797d03523150c5ebe86')
 
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
@@ -54,7 +50,6 @@ build_cyreposurgeon() {
 package_reposurgeon() {
   cd "$srcdir/$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" prefix=/usr install
-  install -m755 repomapper "$pkgdir/usr/bin"
 
   install -dm755 "$pkgdir/usr/share/emacs/site-lisp"
   install -Dm644 reposurgeon-mode.el "$pkgdir/usr/share/emacs/site-lisp"