fully patch the autotools files, fixes FTBFS due updated automake
This commit is contained in:
Dan Horák
parent
b772318207
commit
750ea55889
@ -1,6 +1,6 @@
|
||||
diff -upr man-db-2.6.1.orig/src/Makefile.am man-db-2.6.1/src/Makefile.am
|
||||
--- man-db-2.6.1.orig/src/Makefile.am 2012-04-24 18:47:20.023383735 +0200
|
||||
+++ man-db-2.6.1/src/Makefile.am 2012-04-24 18:54:41.219294370 +0200
|
||||
diff -up man-db-2.6.2/src/Makefile.am.so-links man-db-2.6.2/src/Makefile.am
|
||||
--- man-db-2.6.2/src/Makefile.am.so-links 2012-07-20 19:21:13.000000000 +0200
|
||||
+++ man-db-2.6.2/src/Makefile.am 2012-07-20 19:21:13.000000000 +0200
|
||||
@@ -87,6 +87,8 @@ lexgrog_SOURCES = \
|
||||
descriptions.h \
|
||||
filenames.c \
|
||||
@ -10,9 +10,30 @@ diff -upr man-db-2.6.1.orig/src/Makefile.am man-db-2.6.1/src/Makefile.am
|
||||
lexgrog.l \
|
||||
lexgrog_test.c \
|
||||
manconv.c \
|
||||
diff -upr man-db-2.6.1.orig/src/ult_src.c man-db-2.6.1/src/ult_src.c
|
||||
--- man-db-2.6.1.orig/src/ult_src.c 2012-02-05 14:21:24.000000000 +0100
|
||||
+++ man-db-2.6.1/src/ult_src.c 2012-04-24 19:13:20.499950083 +0200
|
||||
diff -up man-db-2.6.2/src/Makefile.in.so-links man-db-2.6.2/src/Makefile.in
|
||||
--- man-db-2.6.2/src/Makefile.in.so-links 2012-07-20 19:21:13.000000000 +0200
|
||||
+++ man-db-2.6.2/src/Makefile.in 2012-07-20 19:21:39.000000000 +0200
|
||||
@@ -257,7 +257,7 @@ catman_DEPENDENCIES = $(am__DEPENDENCIES
|
||||
am_globbing_OBJECTS = globbing.$(OBJEXT) globbing_test.$(OBJEXT)
|
||||
globbing_OBJECTS = $(am_globbing_OBJECTS)
|
||||
globbing_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
-am_lexgrog_OBJECTS = compression.$(OBJEXT) descriptions.$(OBJEXT) \
|
||||
+am_lexgrog_OBJECTS = globbing.$(OBJEXT) compression.$(OBJEXT) descriptions.$(OBJEXT) \
|
||||
filenames.$(OBJEXT) lexgrog.$(OBJEXT) lexgrog_test.$(OBJEXT) \
|
||||
manconv.$(OBJEXT) manconv_client.$(OBJEXT) ult_src.$(OBJEXT)
|
||||
lexgrog_OBJECTS = $(am_lexgrog_OBJECTS)
|
||||
@@ -1356,6 +1356,8 @@ lexgrog_SOURCES = \
|
||||
descriptions.h \
|
||||
filenames.c \
|
||||
filenames.h \
|
||||
+ globbing.c \
|
||||
+ globbing.h \
|
||||
lexgrog.l \
|
||||
lexgrog_test.c \
|
||||
manconv.c \
|
||||
diff -up man-db-2.6.2/src/ult_src.c.so-links man-db-2.6.2/src/ult_src.c
|
||||
--- man-db-2.6.2/src/ult_src.c.so-links 2012-06-18 04:28:56.000000000 +0200
|
||||
+++ man-db-2.6.2/src/ult_src.c 2012-07-20 19:21:13.000000000 +0200
|
||||
@@ -59,6 +59,8 @@
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -upr man-db-2.6.1.orig/src/globbing.c man-db-2.6.1/src/globbing.c
|
||||
--- man-db-2.6.1.orig/src/globbing.c 2010-09-26 23:08:14.000000000 +0200
|
||||
+++ man-db-2.6.1/src/globbing.c 2012-04-24 14:30:30.113882075 +0200
|
||||
@@ -427,3 +427,30 @@ char **look_for_file (const char *hier,
|
||||
diff -up man-db-2.6.2/src/globbing.c.wildcards man-db-2.6.2/src/globbing.c
|
||||
--- man-db-2.6.2/src/globbing.c.wildcards 2010-09-26 23:08:14.000000000 +0200
|
||||
+++ man-db-2.6.2/src/globbing.c 2012-07-20 19:18:20.000000000 +0200
|
||||
@@ -427,3 +427,30 @@ char **look_for_file (const char *hier,
|
||||
else
|
||||
return gbuf.gl_pathv;
|
||||
}
|
||||
@ -32,9 +32,9 @@ diff -upr man-db-2.6.1.orig/src/globbing.c man-db-2.6.1/src/globbing.c
|
||||
+
|
||||
+ return result;
|
||||
+}
|
||||
diff -upr man-db-2.6.1.orig/src/globbing.h man-db-2.6.1/src/globbing.h
|
||||
--- man-db-2.6.1.orig/src/globbing.h 2008-12-11 00:06:18.000000000 +0100
|
||||
+++ man-db-2.6.1/src/globbing.h 2012-03-26 20:35:49.580882731 +0200
|
||||
diff -up man-db-2.6.2/src/globbing.h.wildcards man-db-2.6.2/src/globbing.h
|
||||
--- man-db-2.6.2/src/globbing.h.wildcards 2008-12-11 00:06:18.000000000 +0100
|
||||
+++ man-db-2.6.2/src/globbing.h 2012-07-20 19:18:20.000000000 +0200
|
||||
@@ -29,3 +29,6 @@ enum look_for_file_opts {
|
||||
/* globbing.c */
|
||||
extern char **look_for_file (const char *hier, const char *sec,
|
||||
@ -42,9 +42,9 @@ diff -upr man-db-2.6.1.orig/src/globbing.h man-db-2.6.1/src/globbing.h
|
||||
+
|
||||
+/* Expand path with wildcards into list of all existing directories. */
|
||||
+extern char **expand_path (const char *path);
|
||||
diff -upr man-db-2.6.1.orig/src/Makefile.am man-db-2.6.1/src/Makefile.am
|
||||
--- man-db-2.6.1.orig/src/Makefile.am 2012-02-05 14:25:20.000000000 +0100
|
||||
+++ man-db-2.6.1/src/Makefile.am 2012-03-26 20:35:49.581882637 +0200
|
||||
diff -up man-db-2.6.2/src/Makefile.am.wildcards man-db-2.6.2/src/Makefile.am
|
||||
--- man-db-2.6.2/src/Makefile.am.wildcards 2012-02-05 14:25:20.000000000 +0100
|
||||
+++ man-db-2.6.2/src/Makefile.am 2012-07-20 19:18:20.000000000 +0200
|
||||
@@ -72,6 +72,8 @@ zsoelim_LDADD = $(LIBMAN) $(libpipeline_
|
||||
accessdb_SOURCES = \
|
||||
accessdb.c
|
||||
@ -69,9 +69,59 @@ diff -upr man-db-2.6.1.orig/src/Makefile.am man-db-2.6.1/src/Makefile.am
|
||||
manconv.c \
|
||||
manconv.h \
|
||||
manp.c \
|
||||
diff -upr man-db-2.6.1.orig/src/manp.c man-db-2.6.1/src/manp.c
|
||||
--- man-db-2.6.1.orig/src/manp.c 2012-02-05 14:18:59.000000000 +0100
|
||||
+++ man-db-2.6.1/src/manp.c 2012-03-26 20:35:49.617879267 +0200
|
||||
diff -up man-db-2.6.2/src/Makefile.in.wildcards man-db-2.6.2/src/Makefile.in
|
||||
--- man-db-2.6.2/src/Makefile.in.wildcards 2012-06-18 14:39:42.000000000 +0200
|
||||
+++ man-db-2.6.2/src/Makefile.in 2012-07-20 19:20:29.000000000 +0200
|
||||
@@ -251,7 +251,7 @@ accessdb_DEPENDENCIES = $(am__DEPENDENCI
|
||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||
am__v_lt_0 = --silent
|
||||
-am_catman_OBJECTS = catman.$(OBJEXT) manp.$(OBJEXT)
|
||||
+am_catman_OBJECTS = globbing.$(OBJEXT) catman.$(OBJEXT) manp.$(OBJEXT)
|
||||
catman_OBJECTS = $(am_catman_OBJECTS)
|
||||
catman_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2)
|
||||
am_globbing_OBJECTS = globbing.$(OBJEXT) globbing_test.$(OBJEXT)
|
||||
@@ -282,10 +282,10 @@ am_mandb_OBJECTS = check_mandirs.$(OBJEX
|
||||
mandb_OBJECTS = $(am_mandb_OBJECTS)
|
||||
mandb_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) \
|
||||
$(am__DEPENDENCIES_2)
|
||||
-am_manpath_OBJECTS = manp.$(OBJEXT) manpath.$(OBJEXT)
|
||||
+am_manpath_OBJECTS = globbing.$(OBJEXT) manp.$(OBJEXT) manpath.$(OBJEXT)
|
||||
manpath_OBJECTS = $(am_manpath_OBJECTS)
|
||||
manpath_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
-am_whatis_OBJECTS = manconv.$(OBJEXT) manp.$(OBJEXT) whatis.$(OBJEXT)
|
||||
+am_whatis_OBJECTS = globbing.$(OBJEXT) manconv.$(OBJEXT) manp.$(OBJEXT) whatis.$(OBJEXT)
|
||||
whatis_OBJECTS = $(am_whatis_OBJECTS)
|
||||
whatis_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) \
|
||||
$(am__DEPENDENCIES_2)
|
||||
@@ -1340,6 +1340,8 @@ accessdb_SOURCES = \
|
||||
|
||||
catman_SOURCES = \
|
||||
catman.c \
|
||||
+ globbing.c \
|
||||
+ globbing.h \
|
||||
manp.c \
|
||||
manp.h
|
||||
|
||||
@@ -1413,11 +1415,15 @@ mandb_SOURCES = \
|
||||
ult_src.h
|
||||
|
||||
manpath_SOURCES = \
|
||||
+ globbing.c \
|
||||
+ globbing.h \
|
||||
manp.c \
|
||||
manp.h \
|
||||
manpath.c
|
||||
|
||||
whatis_SOURCES = \
|
||||
+ globbing.c \
|
||||
+ globbing.h \
|
||||
manconv.c \
|
||||
manconv.h \
|
||||
manp.c \
|
||||
diff -up man-db-2.6.2/src/manp.c.wildcards man-db-2.6.2/src/manp.c
|
||||
--- man-db-2.6.2/src/manp.c.wildcards 2012-02-05 14:18:59.000000000 +0100
|
||||
+++ man-db-2.6.2/src/manp.c 2012-07-20 19:18:20.000000000 +0200
|
||||
@@ -75,6 +75,7 @@
|
||||
#endif
|
||||
|
||||
@ -80,7 +130,7 @@ diff -upr man-db-2.6.1.orig/src/manp.c man-db-2.6.1/src/manp.c
|
||||
|
||||
struct list {
|
||||
char *key;
|
||||
@@ -1035,32 +1036,45 @@ char *get_manpath_from_path (const char
|
||||
@@ -1035,32 +1036,45 @@ char *get_manpath_from_path (const char
|
||||
static void add_dir_to_list (char **lp, const char *dir)
|
||||
{
|
||||
int status;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -upr man-db-2.6.2.orig/gnulib/lib/stdio.in.h man-db-2.6.2/gnulib/lib/stdio.in.h
|
||||
--- man-db-2.6.2.orig/gnulib/lib/stdio.in.h 2012-06-18 06:11:22.000000000 +0200
|
||||
+++ man-db-2.6.2/gnulib/lib/stdio.in.h 2012-06-19 15:29:56.812604417 +0200
|
||||
diff -up man-db-2.6.2/gnulib/lib/stdio.in.h.gnulib-fix man-db-2.6.2/gnulib/lib/stdio.in.h
|
||||
--- man-db-2.6.2/gnulib/lib/stdio.in.h.gnulib-fix 2012-06-18 06:11:22.000000000 +0200
|
||||
+++ man-db-2.6.2/gnulib/lib/stdio.in.h 2012-07-20 19:04:16.000000000 +0200
|
||||
@@ -698,26 +698,14 @@ _GL_WARN_ON_USE (getline, "getline is un
|
||||
# endif
|
||||
#endif
|
||||
@ -32,7 +32,7 @@ diff -upr man-db-2.6.2.orig/gnulib/lib/stdio.in.h man-db-2.6.2/gnulib/lib/stdio.
|
||||
#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
|
||||
struct obstack;
|
||||
/* Grow an obstack with formatted output. Return the number of
|
||||
@@ -1053,9 +1041,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
|
||||
@@ -1053,9 +1041,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@ -45,9 +45,9 @@ diff -upr man-db-2.6.2.orig/gnulib/lib/stdio.in.h man-db-2.6.2/gnulib/lib/stdio.
|
||||
However, we believe that sprintf can be used safely, and is more
|
||||
efficient than snprintf in those safe cases; and as proof of our
|
||||
belief, we use sprintf in several gnulib modules. So this header
|
||||
diff -upr man-db-2.6.2.orig/gnulib/m4/stdio_h.m4 man-db-2.6.2/gnulib/m4/stdio_h.m4
|
||||
--- man-db-2.6.2.orig/gnulib/m4/stdio_h.m4 2012-06-18 06:11:25.000000000 +0200
|
||||
+++ man-db-2.6.2/gnulib/m4/stdio_h.m4 2012-06-19 15:29:56.812604417 +0200
|
||||
diff -up man-db-2.6.2/gnulib/m4/stdio_h.m4.gnulib-fix man-db-2.6.2/gnulib/m4/stdio_h.m4
|
||||
--- man-db-2.6.2/gnulib/m4/stdio_h.m4.gnulib-fix 2012-06-18 06:11:25.000000000 +0200
|
||||
+++ man-db-2.6.2/gnulib/m4/stdio_h.m4 2012-07-20 19:04:16.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-# stdio_h.m4 serial 40
|
||||
+# stdio_h.m4 serial 41
|
||||
@ -84,3 +84,39 @@ diff -upr man-db-2.6.2.orig/gnulib/m4/stdio_h.m4 man-db-2.6.2/gnulib/m4/stdio_h.
|
||||
GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF])
|
||||
GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
|
||||
GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE])
|
||||
diff -up man-db-2.6.2/configure.gnulib-fix man-db-2.6.2/configure
|
||||
--- man-db-2.6.2/configure.gnulib-fix 2012-07-20 19:04:31.000000000 +0200
|
||||
+++ man-db-2.6.2/configure 2012-07-20 19:04:47.000000000 +0200
|
||||
@@ -998,7 +998,6 @@ GNULIB_PERROR
|
||||
GNULIB_PCLOSE
|
||||
GNULIB_OBSTACK_PRINTF_POSIX
|
||||
GNULIB_OBSTACK_PRINTF
|
||||
-GNULIB_GETS
|
||||
GNULIB_GETLINE
|
||||
GNULIB_GETDELIM
|
||||
GNULIB_GETCHAR
|
||||
@@ -19575,7 +19574,6 @@ _ACEOF
|
||||
GNULIB_GETCHAR=0;
|
||||
GNULIB_GETDELIM=0;
|
||||
GNULIB_GETLINE=0;
|
||||
- GNULIB_GETS=0;
|
||||
GNULIB_OBSTACK_PRINTF=0;
|
||||
GNULIB_OBSTACK_PRINTF_POSIX=0;
|
||||
GNULIB_PCLOSE=0;
|
||||
@@ -34421,7 +34419,6 @@ $as_echo "$gl_cv_next_stdio_h" >&6; }
|
||||
GNULIB_GETC=1
|
||||
GNULIB_GETCHAR=1
|
||||
GNULIB_FGETS=1
|
||||
- GNULIB_GETS=1
|
||||
GNULIB_FREAD=1
|
||||
|
||||
|
||||
@@ -34439,7 +34436,7 @@ $as_echo "$gl_cv_next_stdio_h" >&6; }
|
||||
|
||||
|
||||
|
||||
- for gl_func in dprintf fpurge fseeko ftello getdelim getline pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do
|
||||
+ for gl_func in dprintf fpurge fseeko ftello getdelim getline gets pclose popen renameat snprintf tmpfile vdprintf vsnprintf; do
|
||||
as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
|
||||
$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
|
||||
|
||||
10
man-db.spec
10
man-db.spec
@ -4,7 +4,7 @@
|
||||
Summary: Tools for searching and reading man pages
|
||||
Name: man-db
|
||||
Version: 2.6.2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
# project man-db GPLv2+
|
||||
# Gnulib part GPLv3+
|
||||
License: GPLv2+ and GPLv3+
|
||||
@ -29,8 +29,8 @@ Provides: man-pages-reader = %{version}
|
||||
Provides: bundled(gnulib) = %{gnulib_ver}
|
||||
|
||||
Requires: less, coreutils, grep, groff-base, gzip
|
||||
BuildRequires: gdbm-devel, groff, gettext, zlib-devel, libtool
|
||||
BuildRequires: libpipeline-devel, autoconf, gettext-devel, automake
|
||||
BuildRequires: gdbm-devel, groff, gettext, zlib-devel
|
||||
BuildRequires: libpipeline-devel, autoconf, gettext-devel
|
||||
|
||||
%description
|
||||
The man-db package includes five tools for browsing man-pages:
|
||||
@ -49,7 +49,6 @@ manual pages.
|
||||
%patch5 -p1 -b .gnulib-fix
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
%configure\
|
||||
--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
|
||||
--disable-setuid --with-browser=elinks --with-lzip=lzip
|
||||
@ -121,6 +120,9 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
|
||||
%lang(it) %{_datadir}/man/it/man*/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 20 2012 Dan Horák <dan[at]danny.cz> - 2.6.2-4
|
||||
- fully patch the autotools files, fixes FTBFS due updated automake
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user