diff --git a/BibTool-2.48-regex_DESTDIR.patch b/BibTool-2.48-regex_DESTDIR.patch index 9cf4ac7..fbaf731 100644 --- a/BibTool-2.48-regex_DESTDIR.patch +++ b/BibTool-2.48-regex_DESTDIR.patch @@ -1,17 +1,20 @@ +diff -up BibTool-2.48/rewrite.c.regex_DESTDIR BibTool-2.48/rewrite.c --- BibTool-2.48/rewrite.c.regex_DESTDIR 2004-02-08 10:41:52.000000000 +0100 -+++ BibTool-2.48/rewrite.c 2007-01-29 17:58:34.000000000 +0100 -@@ -24,7 +24,7 @@ ++++ BibTool-2.48/rewrite.c 2008-02-14 21:40:13.000000000 +0100 +@@ -24,7 +24,8 @@ #include #ifdef REGEX -#include ++#define __USE_GNU +#include #endif typedef struct rULE +diff -up BibTool-2.48/AutoConf/makefile.in.regex_DESTDIR BibTool-2.48/AutoConf/makefile.in --- BibTool-2.48/AutoConf/makefile.in.regex_DESTDIR 2004-02-08 10:46:11.000000000 +0100 -+++ BibTool-2.48/AutoConf/makefile.in 2007-01-29 17:58:34.000000000 +0100 -@@ -208,9 +208,9 @@ ++++ BibTool-2.48/AutoConf/makefile.in 2008-02-14 21:43:58.000000000 +0100 +@@ -208,9 +208,9 @@ NON_ANSI_DEFS = @DEFS@ REGEX_DIR = regex-0.12 # @@ -23,7 +26,7 @@ # ------------------------------------------------------- # Kpathsea Library support. -@@ -460,8 +460,8 @@ +@@ -460,8 +460,8 @@ $(OFILES): $(MAKEFILE) # __________________________________________________________________ # Targets from the GNU Regular Expression Library. @@ -34,7 +37,7 @@ bibtcl: -@@ -490,7 +490,7 @@ +@@ -490,7 +490,7 @@ test check: (cd Test; $(MAKE)) libbib.a: $(OLIBFILES) @@ -43,7 +46,7 @@ $(RANLIB) $@ depend: -@@ -499,46 +499,46 @@ +@@ -499,46 +499,46 @@ depend: install: install.bin install.lib install.bin install-exec: bibtool$(EXT) @@ -74,9 +77,10 @@ install.man install-man: - -$(INSTALL_DIR) $(MANDIR)$(DIR_SEP)man$(MANSECT) -+ -$(INSTALL_DIR) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT) - $(INSTALL) Doc$(DIR_SEP)bibtool.1 \ +- $(INSTALL) Doc$(DIR_SEP)bibtool.1 \ - $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) ++ -$(INSTALL_DIR) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT) ++ $(INSTALL_DATA) Doc$(DIR_SEP)bibtool.1 \ + $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT) uninstall: uninstall.bin uninstall.lib diff --git a/BibTool.spec b/BibTool.spec index 4f7cb35..943ac6f 100644 --- a/BibTool.spec +++ b/BibTool.spec @@ -1,7 +1,7 @@ Summary: A Tool for manipulating BibTeX data bases Name: BibTool Version: 2.48 -Release: 6%{?dist} +Release: 7%{?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.en.html @@ -32,8 +32,7 @@ make doc %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -make install-man DESTDIR=$RPM_BUILD_ROOT +make install install-man DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' %clean rm -rf $RPM_BUILD_ROOT @@ -48,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/bibtool.1* %changelog +* Thu Feb 14 2008 Patrice Dumas 2.48-7 +- add #define __USE_GNU since in regex GNU extensions are used +- keep timestamps and fix man page permissions + * Mon Jan 29 2007 Patrice Dumas 2.48-6 - use system regex (#225108) - honor optflags (#225108)