Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit man
- From: root@xxxxxxx (h_root)
- Date: Mon, 7 Aug 2006 18:04:07 +0200 (CEST)
- Message-id: <20060807160407.044EA95112@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package man
checked in at Mon Aug 7 18:04:07 CEST 2006.
--------
--- man/man.changes 2006-08-03 10:54:49.000000000 +0200
+++ man/man.changes 2006-08-07 15:43:44.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 7 15:43:06 CEST 2006 - werner@xxxxxxx
+
+- Make it work even with new gettext package
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ man.spec ++++++
--- /var/tmp/diff_new_pack.2Ft1Te/_old 2006-08-07 18:03:28.000000000 +0200
+++ /var/tmp/diff_new_pack.2Ft1Te/_new 2006-08-07 18:03:28.000000000 +0200
@@ -12,7 +12,7 @@
Name: man
BuildRequires: flex groff libzio lynx sharutils util-linux
Version: 2.4.3
-Release: 2
+Release: 3
Summary: A Program for Displaying man Pages
License: GPL
Group: System/Base
@@ -55,7 +55,8 @@
%build
%{?suse_update_config:%{suse_update_config -f tools }}
- rm -f configure
+ gettextize --force --copy --no-changelog
+ rm -f configure GNUmakefile
echo $RPM_OPT_FLAGS
make -f Makefile.Linux compile MANDIR=%{_mandir} SYSCONFDIR=%{_sysconfdir}
@@ -144,6 +145,8 @@
/var/adm/fillup-templates/sysconfig.cron-man
%changelog -n man
+* Mon Aug 07 2006 - werner@xxxxxxx
+- Make it work even with new gettext package
* Thu Aug 03 2006 - sndirsch@xxxxxxx
- read also manual pages in man4x subdirectories; required for
conflicting 'mouse' manual page and i810 driver manual page,
++++++ man-db-2.4.3.dif ++++++
--- /var/tmp/diff_new_pack.2Ft1Te/_old 2006-08-07 18:03:28.000000000 +0200
+++ /var/tmp/diff_new_pack.2Ft1Te/_new 2006-08-07 18:03:28.000000000 +0200
@@ -9,6 +9,28 @@
+patch -p0 -s --suffix=.secu4 < ../man-db-2.4.1-security4.dif
--- GNUmakefile.in
+++ GNUmakefile.in 2006-06-13 16:03:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ # Make targets are: #
+ # #
+ # all install uninstall mostlyclean clean distclean realclean TAGS ID #
+-# FILES lib src man intl libdb zsoelim update RCS dist #
++# FILES lib src man libdb zsoelim update RCS dist #
+ #------------------------------------------------------------------------#
+
+ srcdir = @srcdir@
+@@ -51,9 +51,9 @@
+ # GNUmakefile and include/Defines are automatic targets, don't add below.
+ INCLUDES := config.h $(addprefix include/, manconfig.h comp_src.h)
+ CONF = src/man_db.conf
+-EVERYTHING = lib intl libdb src zsoelim man po
+-ALL = lib intl libdb src zsoelim man po
+-INSTALL = src zsoelim man intl po
++EVERYTHING = lib libdb src zsoelim man po
++ALL = lib libdb src zsoelim man po
++INSTALL = src zsoelim man po
+
+ include include/Defines
+
@@ -162,7 +162,7 @@
install: $(INCLUDES) $(CONF)
@@ -18,6 +40,14 @@
TAGS realclean distclean mostlyclean clean:
for i in $(EVERYTHING); do $(MAKE) prefix=$(prefix) -C $$i $@ clean=yes; done
+@@ -220,7 +220,6 @@
+ for file in $(FILES); do \
+ cp -p $(srcdir)/$$file $(man_db)/$$file; \
+ done
+- $(MAKE) -C intl dist
+ # Maintainers may wish to run 'make -C po update-po' beforehand.
+ # This is not done automatically, since the .po files are stored
+ # in revision control.
--- Makefile.Linux
+++ Makefile.Linux 2006-06-13 18:23:57.000000000 +0200
@@ -0,0 +1,71 @@
@@ -106,7 +136,7 @@
--- configure.in
+++ configure.in 2006-06-13 16:16:03.000000000 +0200
-@@ -10,6 +10,17 @@
+@@ -10,6 +10,18 @@
AC_CANONICAL_HOST
AC_ARG_PROGRAM
dnl
@@ -114,6 +144,7 @@
+dnl
+AC_PROG_CC
+AC_PROG_CPP
++AC_GNU_SOURCE
+dnl
+dnl check for system defaults
+dnl
@@ -124,7 +155,7 @@
dnl Define below date and version information to be put into man pages etc.
dnl
datemark=20050703
-@@ -97,6 +108,18 @@
+@@ -97,6 +109,18 @@
config_file=$withval
fi],
: ${config_file=\$\{sysconfdir\}/man_db.conf})
@@ -143,7 +174,7 @@
dnl
dnl Finish the argument parsing
dnl
-@@ -118,7 +141,7 @@
+@@ -118,7 +142,7 @@
AC_PATH_PROG(lynx, lynx)
AC_PATH_PROG(tr, tr)
AC_PATH_PROG(grep, grep)
@@ -152,7 +183,7 @@
test -n "$pager" && pager="$pager -s"
dnl
dnl define below (in list of preference) *roff macros to check for.
-@@ -214,6 +237,14 @@
+@@ -214,6 +238,14 @@
fi
dnl
AC_PATH_PROGS(eqn, eqn geqn)
@@ -167,7 +198,7 @@
AC_PATH_PROGS(neqn, neqn gneqn)
dnl
dnl if we fail to find an neqn, use eqn and try to force it to output
-@@ -242,10 +273,16 @@
+@@ -242,10 +274,16 @@
decompressor="$gunzip"
fi
AC_PATH_PROG(compress, compress)
@@ -186,7 +217,7 @@
if test -z "$gzip"
then
compressor="$compress -c"
-@@ -299,9 +336,6 @@
+@@ -299,9 +337,6 @@
dnl
dnl check for various header files and associated libraries.
dnl
@@ -196,7 +227,16 @@
dnl AC_PROG_LEX calls AC_TRY_LINK: must come after above 3
AC_PROG_LEX
AC_HEADER_STDC
-@@ -336,6 +370,30 @@
+@@ -313,7 +348,7 @@
+ dnl Internationalization support.
+ dnl
+ AM_GNU_GETTEXT
+-AM_GNU_GETTEXT_VERSION(0.12.1)
++AM_GNU_GETTEXT_VERSION([0.15])
+ AC_SUBST(LINGUAS)dnl
+ dnl
+ dnl Checks for structures and compiler characteristics.
+@@ -336,6 +371,30 @@
MAN_FUNC_PCLOSE
MAN_FUNC_STRSIGNAL
dnl
@@ -219,14 +259,22 @@
+ for lib in ${zio#lib} zio
+ do
+ AC_CHECK_LIB($lib, fzopen, [LIBS="$LIBS -l$lib" ; LEXLIB="$LEXLIB -l$lib"
-+ AC_DEFINE(COMP_SRC)
-+ AC_DEFINE(HAVE_ZIO)])
++ AC_DEFINE([COMP_SRC],[],[])
++ AC_DEFINE([HAVE_ZIO],[],[])])
+ done])
+fi
+dnl
dnl Find a suitable database interface header and library
dnl
dnl Check for Berkeley db routines (first version API)
+@@ -492,7 +551,6 @@
+ include/Defines
+ include/comp_src.h
+ include/manconfig.h
+- intl/Makefile
+ po/Makefile.in)
+ AC_OUTPUT
+
--- mk_catdirs
+++ mk_catdirs 2006-06-14 15:56:12.000000000 +0200
@@ -0,0 +1,24 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |