Hello community, here is the log from the commit of package grep checked in at Mon May 7 18:12:45 CEST 2007. -------- --- grep/grep.changes 2007-03-22 18:18:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/grep/grep.changes 2007-05-07 15:41:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 7 15:41:23 CEST 2007 - schwab@suse.de + +- Try to get something sensible out of CVS. + +------------------------------------------------------------------- Old: ---- grep-2.5.1a.diff grep-2.5.1a-i18n-0.3.patch grep-2.5.1a.tar.bz2 grep-2.5.1-bracket.patch grep-2.5.1-conf.patch grep-2.5.1-nb.patch grep-i18n-speedup.diff grep-manpage-err.diff kwset.diff mbcache.diff pcre-execute.diff skip-devices.diff New: ---- grep-2.5.2-conf.patch grep-2.5.2.diff grep-2.5.2-nb.patch grep-2.5.2.tar.bz2 xfail-tests.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grep.spec ++++++ --- /var/tmp/diff_new_pack.f19899/_old 2007-05-07 18:12:29.000000000 +0200 +++ /var/tmp/diff_new_pack.f19899/_new 2007-05-07 18:12:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package grep (Version 2.5.1a) +# spec file for package grep (Version 2.5.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,24 +18,17 @@ Provides: base:/usr/bin/grep Autoreqprov: on PreReq: %{install_info_prereq} -Version: 2.5.1a -Release: 48 +Version: 2.5.2 +Release: 1 Summary: Print lines matching a pattern Source: grep-%{version}.tar.bz2 Patch: grep-%{version}.diff Patch1: pcre-static.patch -Patch2: grep-2.5.1a-i18n-0.3.patch -Patch3: grep-2.5.1-conf.patch -Patch4: grep-i18n-speedup.diff -Patch5: grep-2.5.1-bracket.patch -Patch6: grep-2.5.1-nb.patch -Patch7: wordmatch.patch -Patch8: grep-manpage-err.diff -Patch9: grep-2.5.1a-mbcset.diff -Patch10: skip-devices.diff -Patch11: pcre-execute.diff -Patch12: kwset.diff -Patch13: mbcache.diff +Patch2: grep-2.5.2-conf.patch +Patch3: grep-2.5.2-nb.patch +Patch4: wordmatch.patch +Patch5: grep-2.5.1a-mbcset.diff +Patch6: xfail-tests.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,30 +50,22 @@ %setup %patch %patch1 -%patch2 -p1 +%patch2 %patch3 %patch4 %patch5 %patch6 -%patch7 -%patch8 -%patch9 -%patch10 -%patch11 -%patch12 -%patch13 -rename no nb po/no.* %build %{suse_update_config -f} -rm -f m4/header.m4 m4/init.m4 m4/install.m4 m4/largefile.m4 m4/missing.m4 m4/sanity.m4 +rm -f m4/header.m4 m4/install.m4 m4/isc-posix.m4 m4/largefile.m4 m4/missing.m4 m4/sanity.m4 autoreconf --force --install test -f po/Makevars || mv po/Makevars.template po/Makevars ./configure CFLAGS="$RPM_OPT_FLAGS" \ --prefix=/usr --mandir=%{_mandir} --infodir=%{_infodir} \ --bindir=/bin --build=%{_target_cpu}-suse-linux make -make check +make check VERBOSE=1 %install make install DESTDIR=$RPM_BUILD_ROOT @@ -111,6 +96,8 @@ /usr/share/locale/*/LC_MESSAGES/grep.mo %changelog +* Mon May 07 2007 - schwab@suse.de +- Try to get something sensible out of CVS. * Thu Mar 22 2007 - schwab@suse.de - Add a variant of the mbcache patch. * Mon Jul 17 2006 - schwab@suse.de ++++++ grep-2.5.1-conf.patch -> grep-2.5.2-conf.patch ++++++ --- grep/grep-2.5.1-conf.patch 2003-07-21 15:57:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/grep/grep-2.5.2-conf.patch 2007-05-07 15:33:28.000000000 +0200 @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- configure.ac ++++ configure.ac @@ -72,6 +72,7 @@ dnl I18N feature ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv" ++++++ grep-2.5.1a.diff -> grep-2.5.2.diff ++++++ --- grep/grep-2.5.1a.diff 2005-03-12 17:37:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/grep/grep-2.5.2.diff 2007-05-07 15:31:36.000000000 +0200 @@ -2,7 +2,7 @@ +++ Makefile.am @@ -5,21 +5,7 @@ - EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM + EXTRA_DIST = TODO README README-alpha -# We should be able to just define `ACLOCAL_AMFLAGS = --acdir=m4', -# but this runs afoul of a bug in automake 1. @@ -23,51 +23,3 @@ # make cvs-clean blatantly stolen from KDE CVS ;) cvs-clean: ---- m4/strerror_r.m4 -+++ m4/strerror_r.m4 -@@ -4,8 +4,6 @@ - # `run'-test that works on BeOS and segfaults on DEC Unix. - # Use with the error.c file in ../lib. - --undefine([AC_FUNC_STRERROR_R]) -- - # AC_FUNC_STRERROR_R - # ------------------ - AC_DEFUN([AC_FUNC_STRERROR_R], ---- src/Makefile.am -+++ src/Makefile.am -@@ -20,11 +20,11 @@ - - egrep: - echo '#!/bin/sh' >$@ -- echo 'exec grep -E $${1+"$$@"}' >>$@ -+ echo 'exec $(bindir)/'`echo grep|sed '$(transform)'`' -E $${1+"$$@"}' >>$@ - chmod a+x $@ - - fgrep: - echo '#!/bin/sh' >$@ -- echo 'exec grep -F $${1+"$$@"}' >>$@ -+ echo 'exec $(bindir)/'`echo grep|sed '$(transform)'`' -F $${1+"$$@"}' >>$@ - chmod a+x $@ - ---- src/dfa.c -+++ src/dfa.c -@@ -482,7 +482,8 @@ - - work_mbc->nchars = work_mbc->nranges = work_mbc->nch_classes = 0; - work_mbc->nequivs = work_mbc->ncoll_elems = 0; -- work_mbc->chars = work_mbc->ch_classes = NULL; -+ work_mbc->chars = NULL; -+ work_mbc->ch_classes = NULL; - work_mbc->range_sts = work_mbc->range_ends = NULL; - work_mbc->equivs = work_mbc->coll_elems = NULL; - -@@ -551,7 +552,7 @@ - wt = wctype (str); - - if (ch_classes_al == 0) -- MALLOC(work_mbc->ch_classes, wchar_t, ++ch_classes_al); -+ MALLOC(work_mbc->ch_classes, wctype_t, ++ch_classes_al); - REALLOC_IF_NECESSARY(work_mbc->ch_classes, wctype_t, - ch_classes_al, - work_mbc->nch_classes + 1); ++++++ grep-2.5.1-nb.patch -> grep-2.5.2-nb.patch ++++++ --- grep/grep-2.5.1-nb.patch 2004-10-20 01:48:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/grep/grep-2.5.2-nb.patch 2007-05-07 15:35:36.000000000 +0200 @@ -1,11 +1,11 @@ ---- configure.in -+++ configure.in -@@ -70,7 +70,7 @@ +--- configure.ac ++++ configure.ac +@@ -96,7 +96,7 @@ esac dnl I18N feature --ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv" -+ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl nb pl pt_BR ru sl sv" +-ALL_LINGUAS="af be bg ca cs da de el eo es et eu fi fr ga gl he hr hu id it ja ko nb nl no pl pt pt_BR ro ru rw sl sr sv tr uk vi zh_TW" ++ALL_LINGUAS="af be bg ca cs da de el eo es et eu fi fr ga gl he hr hu id it ja ko nb nl pl pt pt_BR ro ru rw sl sr sv tr uk vi zh_TW" AM_GNU_GETTEXT AM_GNU_GETTEXT_VERSION(0.12) ++++++ grep-2.5.1a.tar.bz2 -> grep-2.5.2.tar.bz2 ++++++ ++++ 51474 lines of diff (skipped) ++++++ pcre-static.patch ++++++ --- /var/tmp/diff_new_pack.f19899/_old 2007-05-07 18:12:30.000000000 +0200 +++ /var/tmp/diff_new_pack.f19899/_new 2007-05-07 18:12:30.000000000 +0200 @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- configure.ac ++++ configure.ac @@ -136,9 +136,9 @@ if test x"$testpcre" = x"yes"; then if pcre-config --cflags >/dev/null 2>&1; then ++++++ xfail-tests.diff ++++++ --- tests/Makefile.am +++ tests/Makefile.am @@ -5,6 +5,7 @@ TESTS = warning.sh khadafy.sh spencer1.sh bre.sh ere.sh pcre.sh \ status.sh empty.sh options.sh backref.sh file.sh foad1.sh \ fmbtest.sh yesno.sh +XFAIL_TESTS = foad1.sh fmbtest.sh yesno.sh EXTRA_DIST = $(TESTS) \ khadafy.lines khadafy.regexp \ spencer1.awk spencer1.tests \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org