[BibTool] rebase to BibTool 2.58

[Michael J Gruber]

commit 085ac7e328cefddec8eb29cdf290b78de94e364f
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Sat Feb 28 11:26:28 2015 +0100

    rebase to BibTool 2.58
    
    Drop obsolete patch and sync with upstream bugfix release.

 .gitignore                 |  1 +
 BibTool-2.51-cwdPATH.patch | 11 -----------
 BibTool-2.51-regex.patch   | 20 ++++++++++++++------
 BibTool.spec               | 19 ++++++++-----------
 sources                    |  2 +-
 5 files changed, 24 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9eba28f..a0d863c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ BibTool-2.48.tar.gz
 /BibTool-2.51.tar.gz
 /BibTool-2.53.tar.gz
 /BibTool-2.55.tar.gz
+/BibTool-2.58.tar.gz
diff --git a/BibTool-2.51-regex.patch b/BibTool-2.51-regex.patch
index e5cce0d..ca07da0 100644
--- a/BibTool-2.51-regex.patch
+++ b/BibTool-2.51-regex.patch
@@ -10,9 +10,9 @@
  #endif
  
   typedef struct rULE
---- BibTool/AutoConf/makefile.in.regex	2010-04-02 17:47:35.000000000 +0200
-+++ BibTool/AutoConf/makefile.in	2011-05-18 08:40:54.000000000 +0200
-@@ -220,9 +220,9 @@ NON_ANSI_DEFS = @DEFS@
+--- BibTool/AutoConf/makefile.in.regex	2015-02-09 20:29:03.000000000 +0100
++++ BibTool/AutoConf/makefile.in	2015-02-28 12:28:26.622331580 +0100
+@@ -218,9 +218,9 @@
  REGEX_DIR  = regex-0.12
  # 
  
@@ -24,7 +24,15 @@
  
  # -------------------------------------------------------
  #  Kpathsea Library support.
-@@ -473,8 +473,8 @@ $(OFILES): $(MAKEFILE)
+@@ -343,7 +343,6 @@
+ 		${HPATH}parse.h			\
+ 		${HPATH}print.h			\
+ 		${HPATH}pxfile.h		\
+-		${HPATH}regex.h			\
+ 		${HPATH}record.h		\
+ 		${HPATH}resource.h		\
+ 		${HPATH}rewrite.h		\
+@@ -477,8 +476,8 @@
  # __________________________________________________________________
  #  Targets from the GNU Regular Expression Library.
  
@@ -35,8 +43,8 @@
  
  
  bibtcl:
-@@ -503,7 +503,7 @@ test check:
- 	(cd Test; $(MAKE))
+@@ -512,7 +511,7 @@
+ 	(cd test; $(MAKE))
  
  libbib.a: $(OLIBFILES)
 -	$(AR) $@ $(OLIBFILES) regex.o
diff --git a/BibTool.spec b/BibTool.spec
index b88c8b9..3f97dd5 100644
--- a/BibTool.spec
+++ b/BibTool.spec
@@ -1,14 +1,13 @@
 Summary:        A Tool for manipulating BibTeX data bases
 Name:           BibTool
-Version:        2.55
-Release:        6%{?dist}
+Version:        2.58
+Release:        1%{?dist}
 Group:          Applications/Publishing
 Source:         ftp://ftp.dante.de/tex-archive/biblio/bibtex/utils/bibtool/BibTool-%{version}.tar.gz
 URL:            http://www.gerd-neugebauer.de/software/TeX/BibTool/
 Patch0:         BibTool-2.51-regex.patch
 License:        GPL+
 BuildRequires:  tex(latex) tex-bibtex tex-makeindex
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 BibTeX provides an easy to use means to integrate citations and
@@ -30,12 +29,6 @@ rm -rf regex-0.12
 sed -i -e 's#@kpathsea_lib_static@##' makefile
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 make doc
-# Convert to utf-8
-for file in INSTALL; do
-    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
-    touch -r $file $file.new && \
-    mv $file.new $file
-done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,14 +40,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes.tex COPYING INSTALL README THANKS
-%doc Doc/bibtool.pdf Doc/ref_card.pdf
+%doc Changes.tex COPYING README THANKS
+%doc doc/bibtool.pdf doc/ref_card.pdf
 %doc Perl/ Tcl/
 %{_bindir}/bibtool
 %{_datadir}/BibTool/
 %{_mandir}/man1/bibtool.1*
 
 %changelog
+* Sat Feb 28 2015 Michael J Gruber <mjg at fedoraproject.org> - 2.58-1
+- rebase to BibTool 2.58
+- drop obsolete patch
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.55-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 35bdb37..9d14bf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b075749769f0535363e223cb670f7a06  BibTool-2.55.tar.gz
+138cea71a2af8e5aec301b0cfc69f8a3  BibTool-2.58.tar.gz