OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grep?expand=0&rev=3

grep.spec

@@ -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 @@ Group:          Productivity/Text/Utilities
 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 @@ Authors:
 %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 @@ ln -sf ../../bin/grep  $RPM_BUILD_ROOT/usr/bin/grep
 /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