rpms/BibTool/devel BibTool-2.48-regex_DESTDIR.patch, NONE, 1.1 BibTool.spec, 1.3, 1.4 bibtool-AutoConf-makefile.in-honor_DESTDIR.diff, 1.1, NONE
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Mon Jan 29 17:43:45 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/BibTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9692
Modified Files:
BibTool.spec
Added Files:
BibTool-2.48-regex_DESTDIR.patch
Removed Files:
bibtool-AutoConf-makefile.in-honor_DESTDIR.diff
Log Message:
* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 2.48-6
- use system regex (#225108)
- honor optflags (#225108)
- merge honor_DESTDIR diff with regex changes in regex_DESTDIR
- don't ship c_lib.dvi
BibTool-2.48-regex_DESTDIR.patch:
--- NEW FILE BibTool-2.48-regex_DESTDIR.patch ---
--- 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 @@
#include <bibtool/rewrite.h>
#ifdef REGEX
-#include <bibtool/regex.h>
+#include <regex.h>
#endif
typedef struct rULE
--- 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 @@
REGEX_DIR = regex-0.12
#
-REGEX_DEF = -DREGEX -I$(REGEX_DIR) -I..
+REGEX_DEF = -DREGEX
-REGEX = regex$(OBJ)
+REGEX =
# -------------------------------------------------------
# Kpathsea Library support.
@@ -460,8 +460,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 $@
bibtcl:
@@ -490,7 +490,7 @@
(cd Test; $(MAKE))
libbib.a: $(OLIBFILES)
- $(AR) $@ $(OLIBFILES) regex.o
+ $(AR) $@ $(OLIBFILES)
$(RANLIB) $@
depend:
@@ -499,46 +499,46 @@
install: install.bin install.lib
install.bin install-exec: bibtool$(EXT)
- -$(INSTALL_DIR) $(BINDIR)
- $(INSTALL) bibtool$(EXT) $(BINDIR)
+ -$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+ $(INSTALL) bibtool$(EXT) $(DESTDIR)$(BINDIR)
INSTALL_LIB_FILES = Lib$(DIR_SEP)*.*
install.lib install-data:
- -$(INSTALL_DIR) $(LIBDIR)
+ -$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
for lib in $(INSTALL_LIB_FILES); do \
- $(INSTALL_DATA) $$lib $(LIBDIR); \
+ $(INSTALL_DATA) $$lib $(DESTDIR)$(LIBDIR); \
done
INSTALL_INCLUDE_FILES = $(HFILES)
install.include install-include:
- -$(INSTALL_DIR) $(INCLUDEDIR)
+ -$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
for inc in $(INSTALL_INCLUDE_FILES); do \
- $(INSTALL_DATA) $$inc $(INCLUDEDIR); \
+ $(INSTALL_DATA) $$inc $(DESTDIR)$(INCLUDEDIR); \
done
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 \
- $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
+ $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
uninstall: uninstall.bin uninstall.lib
uninstall.bin uninstall-exec:
- -$(RM) $(BINDIR)$(DIR_SEP)bibtool$(EXT)
+ -$(RM) $(DESTDIR)$(BINDIR)$(DIR_SEP)bibtool$(EXT)
uninstall.lib uninstall-data:
- -$(RM) $(LIBDIR)
+ -$(RM) $(DESTDIR)$(LIBDIR)
uninstall.include uninstall-include:
- -$(RM) $(INCLUDEDIR)
+ -$(RM) $(DESTDIR)$(INCLUDEDIR)
uninstall.man uninstall-man:
- -$(RM) $(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
+ -$(RM) $(DESTDIR)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
status:
- @echo $(LIBDIR)
+ @echo $(DESTDIR)$(LIBDIR)
# =============================================================================
# DO NOT DELETE THIS LINE -- make depend depends on it.
Index: BibTool.spec
===================================================================
RCS file: /cvs/extras/rpms/BibTool/devel/BibTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BibTool.spec 10 Sep 2006 22:10:40 -0000 1.3
+++ BibTool.spec 29 Jan 2007 17:43:15 -0000 1.4
@@ -1,11 +1,11 @@
Summary: A Tool for manipulating BibTeX data bases
-Name: BibTool
+Name: BibTool
Version: 2.48
-Release: 5%{?dist}
-Group: Applications/Publishing
+Release: 6%{?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
-Patch: bibtool-AutoConf-makefile.in-honor_DESTDIR.diff
+Patch0: BibTool-2.48-regex_DESTDIR.patch
License: GPL
BuildRequires: tetex-latex
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,14 +18,16 @@
goes beyond the possibilities --- and intentions --- of BibTeX.
%prep
-%setup
-%patch
-sed -i -e 's%^#!/usr/local/bin/tclsh%#!/usr/bin/tclsh%' Tcl/bibtool.tcl
-sed -i -e 's%^#!/usr/local/bin/perl%#!/usr/bin/perl%' Perl/bibtool.pl
+%setup -q
+%patch0 -p1 -b .regex_DESTDIR
+sed -i -e 's%^#!/usr/local/bin/tclsh%#! %{_bindir}/tclsh%' Tcl/bibtool.tcl
+sed -i -e 's%^#!/usr/local/bin/perl%#! %{_bindir}/perl%' Perl/bibtool.pl
+# configure will recreate the directory, but only with config.h within
+rm -rf regex-0.12
%build
%configure --libdir=%{_datadir}
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
make doc
%install
@@ -38,12 +40,20 @@
%files
%defattr(-,root,root,-)
-%doc Changes.xml COPYING INSTALL README THANKS Doc/*.dvi Perl Tcl
+%doc Changes.xml COPYING INSTALL README THANKS
+%doc Doc/bibtool.dvi Doc/ref_card.dvi
+%doc Perl/ Tcl/
%{_bindir}/bibtool
%{_datadir}/BibTool/
-%{_mandir}/man1/bibtool*
+%{_mandir}/man1/bibtool.1*
%changelog
+* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 2.48-6
+- use system regex (#225108)
+- honor optflags (#225108)
+- merge honor_DESTDIR diff with regex changes in regex_DESTDIR
+- don't ship c_lib.dvi
+
* Sun Sep 10 2006 Patrice Dumas <pertusus at free.fr> 2.48-5
- rebuild for FC6
--- bibtool-AutoConf-makefile.in-honor_DESTDIR.diff DELETED ---
More information about the scm-commits
mailing list