This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
0495f5fb58
commit
0debf6ea62
@ -1,8 +0,0 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -167,4 +167,4 @@ if test x"$testpcre" = x"yes"; then
|
||||
AC_SEARCH_LIBS(pcre_exec, pcre, [AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the `pcre' library (-lpcre).])])
|
||||
fi
|
||||
|
||||
-AC_OUTPUT(Makefile lib/Makefile lib/posix/Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile vms/Makefile bootstrap/Makefile, [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; echo timestamp > stamp-h])
|
||||
+AC_OUTPUT(Makefile lib/Makefile lib/posix/Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile vms/Makefile bootstrap/Makefile)
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -96,7 +96,7 @@
|
||||
esac
|
||||
|
||||
dnl I18N feature
|
||||
-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)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f88888d953c05ac60aa5e21d03e23bbe8b1ab8419156382614d49c0a961e586f
|
||||
size 430895
|
||||
3
grep-2.5.4.tar.bz2
Normal file
3
grep-2.5.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020
|
||||
size 723181
|
||||
@ -479,7 +479,7 @@
|
||||
{
|
||||
int remain_bytes, i;
|
||||
+ bool in_shift = false;
|
||||
buf_begin = begin;
|
||||
buf_begin = (unsigned char const *) begin;
|
||||
buf_end = end;
|
||||
|
||||
@@ -2851,9 +2872,16 @@ dfaexec (struct dfa *d, char const *begi
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 11 14:09:00 CET 2009 - schwab@suse.de
|
||||
|
||||
- Update to grep 2.5.4.
|
||||
* This is a bugfix release. No new features.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 14 17:22:17 CEST 2008 - schwab@suse.de
|
||||
|
||||
|
||||
27
grep.spec
27
grep.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package grep (Version 2.5.2)
|
||||
# spec file for package grep (Version 2.5.4)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,19 +25,15 @@ Group: Productivity/Text/Utilities
|
||||
Provides: base:/usr/bin/grep
|
||||
AutoReqProv: on
|
||||
PreReq: %{install_info_prereq}
|
||||
Version: 2.5.2
|
||||
Release: 90
|
||||
Version: 2.5.4
|
||||
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.2-conf.patch
|
||||
Patch3: grep-2.5.2-nb.patch
|
||||
Patch4: wordmatch.patch
|
||||
Patch5: grep-2.5.1a-mbcset.diff
|
||||
Patch6: xfail-tests.diff
|
||||
Patch7: icase.diff
|
||||
Patch8: grep-i18n-speedup.diff
|
||||
Patch2: grep-2.5.1a-mbcset.diff
|
||||
Patch3: icase.diff
|
||||
Patch4: grep-i18n-speedup.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -62,11 +58,7 @@ Authors:
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch8
|
||||
rm -f lib/regex.[ch]
|
||||
rm -f lib/regex.h
|
||||
rm -f m4/header.m4 m4/install.m4 m4/isc-posix.m4 m4/largefile.m4 m4/missing.m4 m4/sanity.m4
|
||||
|
||||
%build
|
||||
@ -101,6 +93,9 @@ ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep
|
||||
%doc %{_infodir}/*.gz
|
||||
|
||||
%changelog
|
||||
* Wed Feb 11 2009 schwab@suse.de
|
||||
- Update to grep 2.5.4.
|
||||
* This is a bugfix release. No new features.
|
||||
* Thu Aug 14 2008 schwab@suse.de
|
||||
- More speedups.
|
||||
* Tue Jun 03 2008 schwab@suse.de
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
@@ -136,9 +136,9 @@
|
||||
if test x"$testpcre" = x"yes"; then
|
||||
if pcre-config --cflags >/dev/null 2>&1; then
|
||||
CFLAGS="$CFLAGS `pcre-config --cflags`"
|
||||
CPPFLAGS="$CPPFLAGS `pcre-config --cflags`"
|
||||
- LIBS="$LIBS `pcre-config --libs`"
|
||||
+ LIBS="$LIBS -Wl,-Bstatic `pcre-config --libs` -Wl,-Bdynamic"
|
||||
fi
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/search.c
|
||||
+++ src/search.c
|
||||
@@ -641,7 +641,8 @@
|
||||
break;
|
||||
if (try + len < buf + size && WCHAR((unsigned char) try[len]))
|
||||
{
|
||||
- offset = kwsexec (kwset, beg, --len, &kwsmatch);
|
||||
+ ++beg;
|
||||
+ offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch);
|
||||
if (offset == (size_t) -1)
|
||||
{
|
||||
#ifdef MBS_SUPPORT
|
||||
@ -1,10 +0,0 @@
|
||||
--- 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 \
|
||||
Loading…
Reference in New Issue
Block a user