AASTeX6 has been updated so the workaround patch is no longer needed

3 files changed, 6 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c61b7c26b1ab..633885812eb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = texlive-aastex6
 	pkgdesc = Package for preparing papers in American Astronomical Society (AAS) journals
 	pkgver = 6.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://journals.aas.org/authors/aastex.html
 	install = texlive-aastex6.install
 	arch = i686
@@ -11,10 +11,8 @@ pkgbase = texlive-aastex6
 	provides = texlive-aastex6
 	source = http://journals.aas.org/authors/aastex/aastex61.cls
 	source = http://journals.aas.org/authors/aastex/aasjournal.bst
-	source = 0001-Apply-temporary-Linux-work-around-for-V6.1.patch
-	sha1sums = 94971eeff1130bb9a5632e985d0ba514fe5cb9ed
+	sha1sums = 22c8bd935e2c0d935b4ae13cae79a3894493e58a
 	sha1sums = 693276c5dd1ac4111a696088aea4a79534c77620
-	sha1sums = 23d0182902fdb062ff14fb3b87ee4a8665bb4975
 
 pkgname = texlive-aastex6
 
diff --git a/0001-Apply-temporary-Linux-work-around-for-V6.1.patch b/0001-Apply-temporary-Linux-work-around-for-V6.1.patch
deleted file mode 100644
index b180293aa03e..000000000000
--- a/0001-Apply-temporary-Linux-work-around-for-V6.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9cc9f4b6f91293d69ecc334c222691c6775722c1 Mon Sep 17 00:00:00 2001
-From: Josiah Schwab <jschwab@gmail.com>
-Date: Sat, 12 Nov 2016 10:38:49 -0800
-Subject: [PATCH] Apply temporary Linux work around for V6.1
-
-http://journals.aas.org/authors/aastex/linux.html
----
- aastex61.cls | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aastex61.cls b/aastex61.cls
-index 41adeb1..563ac9a 100644
---- a/aastex61.cls
-+++ b/aastex61.cls
-@@ -6318,9 +6318,9 @@ width 0pt\relax\fi}}}
- }%
- 
- 
--%% get rid of \jobname Notes being sent to .aux file:
--\let\bibdata@app\relax
--\def\pre@bibdata{}
-+% %% get rid of \jobname Notes being sent to .aux file:
-+% \let\bibdata@app\relax
-+% \def\pre@bibdata{}
- 
- \def\frontmatter@author@produce@script{%
-   \begingroup
--- 
-2.10.2
-
diff --git a/PKGBUILD b/PKGBUILD
index a1a6e1602068..f36ec301f5d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,16 @@
 pkgname=texlive-aastex6
 pkgdesc="Package for preparing papers in American Astronomical Society (AAS) journals "
 pkgver=6.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://journals.aas.org/authors/aastex.html"
 depends=('texlive-core' 'texlive-publishers')
 provides=('texlive-aastex6')
 install=texlive-aastex6.install
 source=('http://journals.aas.org/authors/aastex/aastex61.cls'
-        'http://journals.aas.org/authors/aastex/aasjournal.bst'
-        '0001-Apply-temporary-Linux-work-around-for-V6.1.patch')
-sha1sums=('94971eeff1130bb9a5632e985d0ba514fe5cb9ed'
-          '693276c5dd1ac4111a696088aea4a79534c77620'
-          '23d0182902fdb062ff14fb3b87ee4a8665bb4975')
-
-
-prepare() {
-
-  # apply suggested Linux workaround
-  patch -Np1 --follow-symlinks -i "$srcdir/0001-Apply-temporary-Linux-work-around-for-V6.1.patch"
-
-}
+        'http://journals.aas.org/authors/aastex/aasjournal.bst')
+sha1sums=('22c8bd935e2c0d935b4ae13cae79a3894493e58a'
+          '693276c5dd1ac4111a696088aea4a79534c77620')
 
 
 package() {