From 40f28fadae738456c6165f00103c5b8af6500f83f29633b4d2929434bc9432f8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 29 Jan 2024 16:48:18 +0000 Subject: [PATCH] Accepting request 1142233 from home:jgwang:branches:Publishing - Update to version 2.68 OBS-URL: https://build.opensuse.org/request/show/1142233 OBS-URL: https://build.opensuse.org/package/show/Publishing/bibtool?expand=0&rev=17 --- BibTool-2.63.tar.gz | 3 --- BibTool-2.63.tar.gz.asc | 11 ----------- BibTool-2.68.tar.gz | 3 +++ BibTool-2.68.tar.gz.asc | 11 +++++++++++ bibtool-use-system-regex.patch | 33 +++++++++++++++------------------ bibtool.changes | 28 ++++++++++++++++++++++++++++ bibtool.spec | 10 +++++----- 7 files changed, 62 insertions(+), 37 deletions(-) delete mode 100644 BibTool-2.63.tar.gz delete mode 100644 BibTool-2.63.tar.gz.asc create mode 100644 BibTool-2.68.tar.gz create mode 100644 BibTool-2.68.tar.gz.asc diff --git a/BibTool-2.63.tar.gz b/BibTool-2.63.tar.gz deleted file mode 100644 index dcef487..0000000 --- a/BibTool-2.63.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57d6500abf23374bd9f3adeff9534d1dd3d31b796848a5f1e6414978ca7c2552 -size 715528 diff --git a/BibTool-2.63.tar.gz.asc b/BibTool-2.63.tar.gz.asc deleted file mode 100644 index 769d34e..0000000 --- a/BibTool-2.63.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iQEcBAABAgAGBQJWmmu2AAoJEOohaL5pkhOiYxIH/Rc91LO7VlkpuVF+pWlIq9xQ -B48rzih6U3F9EivkRzV4KLT8XS0s4vJS3P0IK8iWMZYI3vMoIUOtYfAGve6lOgOm -VicHbnsSP79ccBwLdaL1Hk1MuU5HTFWPupzSkb9okgvTZnVCaOkrXaGVkX4JbTZb -RpafTrc3XXgroeRvYUvqAAj2NIMn++gMIw0t1J7CzGYqko14hSI1qSaIrp1Wcw7A -Euq1D7ussablIdW3mc7RbZKJ938RSTB5n2F4U4DcXkXYWULyQmz0q4ERJSjG7a9C -H+EbWwt8EWEokXFXdrUYlly/Ly+QmAIGC64KO2f87kQy6zslEUOfR7uG33X7d3g= -=kEIl ------END PGP SIGNATURE----- diff --git a/BibTool-2.68.tar.gz b/BibTool-2.68.tar.gz new file mode 100644 index 0000000..d9fd4b8 --- /dev/null +++ b/BibTool-2.68.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7134ce3a05fe94c04b88f18261139656ac4c0c0893de15acc0daabc90248b8fa +size 745469 diff --git a/BibTool-2.68.tar.gz.asc b/BibTool-2.68.tar.gz.asc new file mode 100644 index 0000000..696696c --- /dev/null +++ b/BibTool-2.68.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE4qYJgwzhZ1ZmZxuG6iFovmmSE6IFAl6Uf48ACgkQ6iFovmmS +E6JUygf/cyMTwCoduU2qN5cXMkldnjZsJvSB1h2MVNYv3W9nV/sGVc38huX5Cqpl +52h59g7kgaBEbtfjY7s3ljf4IoXixtSBNoL/8BgIGul9jvblvNkB+824fN1nI2ZF +PQ3TrMCMDYC94srMA8DkBQPPSpbvrNsO2srwB3Zg49eXbYYs+rBECIkBAZze8C/W +qjXd6ciservjiBvak2RDD9qPrLNaMemUm11RjuOS2hWI2PlVF5wdfSPxNbH7rXRY +bTXP3oQKPXk2+EgMZbsl+Sm5Dizleua9yumex/d/sCnjgA2qgOida7jb9NxGkcx0 +JNrJFCwVsgNEo9dWduPDnRoeJLz04g== +=i4qN +-----END PGP SIGNATURE----- diff --git a/bibtool-use-system-regex.patch b/bibtool-use-system-regex.patch index 96d673d..17dcd3c 100644 --- a/bibtool-use-system-regex.patch +++ b/bibtool-use-system-regex.patch @@ -1,8 +1,7 @@ -Index: BibTool/AutoConf/makefile.in -=================================================================== ---- BibTool.orig/AutoConf/makefile.in -+++ BibTool/AutoConf/makefile.in -@@ -218,9 +218,9 @@ NON_ANSI_DEFS = @DEFS@ +diff -auNr BibTool/AutoConf/makefile.in BibTool-new/AutoConf/makefile.in +--- BibTool/AutoConf/makefile.in 2020-04-13 22:32:40.000000000 +0800 ++++ BibTool-new/AutoConf/makefile.in 2024-01-29 18:09:47.041145779 +0800 +@@ -234,9 +234,9 @@ REGEX_DIR = regex-0.12 # @@ -14,37 +13,35 @@ Index: BibTool/AutoConf/makefile.in # ------------------------------------------------------- # Kpathsea Library support. -@@ -476,8 +476,8 @@ $(OFILES): $(MAKEFILE) +@@ -500,8 +500,8 @@ # __________________________________________________________________ # Targets from the GNU Regular Expression Library. -regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE) - $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@ -+#regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE) -+# $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@ ++# regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE) ++# $(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@ bibtcl: -@@ -511,7 +511,7 @@ Test: +@@ -535,7 +535,7 @@ (cd test; $(MAKE)) - libbib.a: $(OLIBFILES) + libbibtool.a: $(OLIBFILES) - $(AR) $@ $(OLIBFILES) regex.o + $(AR) $@ $(OLIBFILES) $(RANLIB) $@ depend: -Index: BibTool/rewrite.c -=================================================================== ---- BibTool.orig/rewrite.c -+++ BibTool/rewrite.c -@@ -22,7 +22,8 @@ - #include +diff -auNr BibTool/rewrite.c BibTool-new/rewrite.c +--- BibTool/rewrite.c 2020-04-13 22:31:54.000000000 +0800 ++++ BibTool-new/rewrite.c 2024-01-29 18:10:26.031482831 +0800 +@@ -37,7 +37,8 @@ + #include #ifdef REGEX --#include + #include +#define __USE_GNU -+#include #endif typedef struct rULE diff --git a/bibtool.changes b/bibtool.changes index 67af0e1..38d9982 100644 --- a/bibtool.changes +++ b/bibtool.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Jan 29 11:01:39 UTC 2024 - jun wang + +- Update to version 2.68 + * Handling of extracting by aux file improved. + * Record extended by attribute lineno.This attribute carries + the line number of the initiating @. + * The format of the error messages has been slightly + streamlined. Double spaces are avoided; two colons in one + message are avoided. + * The format of the messages of check_rule include file and + line number. + * Warning for double fields added. + * The empty output file is used to signal that the output + should be suppressed. + * The resources check.warning.rule and check.error.rule have + been introduced to allow semantic checks to be classified + as warning or error. + * The behaviour of the resource check.double has been + generalized. The requirement that double entries to be + adjacent has been dropped. This has the impact that the + processing is slightly slower. + * New resource file unique.field introduced. With this + resource it is possible to specify additional unique + constraints for fields. If different records have the same + value for one of those fields then a warning is issued. + * Static library renamed from libbib.a to libbibtool.a. + ------------------------------------------------------------------- Thu Oct 17 14:35:50 UTC 2019 - Richard Brown diff --git a/bibtool.spec b/bibtool.spec index 6239b08..1f80408 100644 --- a/bibtool.spec +++ b/bibtool.spec @@ -1,7 +1,7 @@ # # spec file for package bibtool # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2011 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -18,11 +18,11 @@ Name: bibtool -Version: 2.63 +Version: 2.68 Release: 0 Summary: Tool for Manipulating BibTeX Databases -License: GPL-1.0-or-later AND CC-BY-SA-3.0 -Url: http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html +License: CC-BY-SA-3.0 AND GPL-1.0-or-later +URL: http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html Source0: http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-%{version}.tar.gz Source1: http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-%{version}.tar.gz.asc Source2: %{name}.keyring @@ -38,7 +38,7 @@ BibTeX files which goes beyond the possibilities - and intentions - of BibTeX. %prep %setup -q -n BibTool -%patch1 -p1 +# %patch1 -p1 %build %configure