Accepting request 456376 from home:pluskalm:branches:Base:System
- Update to version 3.0:
* grep without -F no longer goes awry when given two or more
patterns that contain no special characters other than '\' and
also contain a subpattern like '\.' that escapes a character to
make it ordinary.
* grep no longer fails to build on PCRE versions before 8.20.
- Cleanup spec file:
* Drop support for old distributions
* Create lang subpackage
* Use fdupes to replace duplicate files with symlinks
OBS-URL: https://build.opensuse.org/request/show/456376
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=79
This commit is contained in:
Git OBS Bridge
parent
58a5d7a714
commit
7bdb31fdca
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3bad4c23eeb8dfa2fa84cdbe368398f75fdcd54bde411db83b9ef7fba5b60185
|
||||
size 1374532
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABCgAGBQJYmSDLAAoJEH/Z/MsAC+7uvbUQAJU2OZdODROLbVVoU/VgAzmt
|
||||
Ldy+krs0zmCx3oi9ZrDPCqeBTMibwyHXK4jwT8NJs+eiKw610hpTGjS6Zv8qcq1V
|
||||
Ca6TNa1Pn969llF4T5A/t/HZdBZdvWgxlO1UTcRmlXIKCtnHjC1kkd6Jxz2EtNdS
|
||||
npgxKBNAExhWlrbuc4xOX4qpl+jTTP6iNUG8QPFOOCQT5NcDYhecinPDWqRMCWHU
|
||||
gzitw8szTT28b3UzspgH6f390rVDFc/OFLy9ET4zbH5IXi8XqkKlStpPmWcu1CoW
|
||||
Fm3ej03LvgGqc4wDjbwl/TNrV0YgUYvMH11EpAc9uOTpx9hUKwtGeR5SXG8XDrN1
|
||||
kaZR2bxIXZ3XdJbQG9Mj4oIowhf+aaVujrOU51i7YisHXIogsQBAR/s8UjpqsS7b
|
||||
PJQQv3YZO8czujI7WNbSAY9P/X1yIBODPg4Ude8/fn4hRnUhrBN0NMsWhFp1bp6z
|
||||
esLDRoOnrxRU3jA57y1JxxAvVQgl6zpjMM+IV/g6SeT/vErHJ/9lNggJyw+ZwP3l
|
||||
Qdu2X4mTK6mxqXFyuJaZRA2bsxTna5jt0zT3k40ulniJlrPXf+JEBgX4VqvSUc5j
|
||||
eq1VINQnu8jkHXLXOBXGczqsh/0qaDVtqoDrTsc7jbdjDjcVpDZAqd7edmSVtEsX
|
||||
k76sQQCLEEYsHUWFkbgI
|
||||
=AMbj
|
||||
-----END PGP SIGNATURE-----
|
||||
3
grep-3.0.tar.xz
Normal file
3
grep-3.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5
|
||||
size 1375156
|
||||
16
grep-3.0.tar.xz.sig
Normal file
16
grep-3.0.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABCgAGBQJYnUG1AAoJEH/Z/MsAC+7uWeEP/RnQmcTeuNSn7bmtYgnvIXjJ
|
||||
28pREAwSc6fYTU4Yrb5+aRWBJ5/7qCEXt/YgjQ3W+y3OixfPm0K5qvJpP3EnbfFX
|
||||
gCBsycV+Dz2/mVISMkcCOd/4WY2rLiwRszmGKYOwaXIfE9D2vjB8+pZLwQ4+1bnb
|
||||
ELYcZN66/Hqesc1i34Z8jl8PpiwnOmQCHkhx5LQuFXx6WwaIbji+cuFDZyQlQSih
|
||||
uejW5Qu/yu7fQkjEGD72wshviDTl35xHwUmvtOIyfDjf3x00Cl8ptw5c+h8ucbml
|
||||
r+bQdNV7OvCzPxJSH87G05CSIZto15FnLFT8nGb94umi78hzcEplf/+H5GkCHgBn
|
||||
aqY5u+v74I4BmbcB5WQb9bVHTX3p6mTUa23l5m1HB6KDwF5lWyi+MFN4kuGX1QbE
|
||||
iltyPII+IhWZ2WuxHO4ATJjRmxFWMe8RldWtCK2qn9K9be/bFR05gdCpe40rpK+E
|
||||
8cCdQWFR9AJWt59QDvUwDuTi9FAYRYJELtaNPJgEsyqk2g7OMc7HSFE80Ku5RWq/
|
||||
LEZUApdENACCcu7BtQHYHzO5RTq4mOTd6USrmAg3xAAeRPOrO4UEqwXkaohZOqSX
|
||||
2PYMEnbaiP2IMtKfgf/ax+d9+r4iTmIhr25xbTrwncH+wp9mp2qGAnCgPomvooK9
|
||||
4kqk6kOPz90dE01/3gBf
|
||||
=PTIy
|
||||
-----END PGP SIGNATURE-----
|
||||
14
grep.changes
14
grep.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 11 07:19:36 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
- Update to version 3.0:
|
||||
* grep without -F no longer goes awry when given two or more
|
||||
patterns that contain no special characters other than '\' and
|
||||
also contain a subpattern like '\.' that escapes a character to
|
||||
make it ordinary.
|
||||
* grep no longer fails to build on PCRE versions before 8.20.
|
||||
- Cleanup spec file:
|
||||
* Drop support for old distributions
|
||||
* Create lang subpackage
|
||||
* Use fdupes to replace duplicate files with symlinks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 8 09:56:26 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
||||
58
grep.spec
58
grep.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: grep
|
||||
Version: 2.28
|
||||
Version: 3.0
|
||||
Release: 0
|
||||
Summary: Print lines matching a pattern
|
||||
License: GPL-3.0+
|
||||
@ -26,80 +26,66 @@ Url: http://www.gnu.org/software/grep/
|
||||
Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
||||
Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
|
||||
Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: xz
|
||||
Requires(pre): %{install_info_prereq}
|
||||
Requires(preun): %{install_info_prereq}
|
||||
Recommends: %{name}-lang
|
||||
Provides: base:%{_bindir}/grep
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} < 1120
|
||||
BuildRequires: pcre
|
||||
%endif
|
||||
|
||||
%description
|
||||
The grep command searches one or more input files for lines
|
||||
containing a match to a specified pattern. By default, grep prints
|
||||
the matching lines.
|
||||
The grep command searches one or more input files for lines containing a
|
||||
match to a specified pattern. By default, grep prints the matching lines.
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if 0%{?suse_version} < 1120
|
||||
echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache
|
||||
%endif
|
||||
|
||||
%build
|
||||
%global optflags %{optflags} -fPIE
|
||||
export LDFLAGS="-pie"
|
||||
%if 0%{?suse_version} < 1120
|
||||
%configure -C --bindir=/bin --disable-silent-rules
|
||||
%else if 0%{?suse_version} < 1310
|
||||
%configure --disable-silent-rules
|
||||
%else
|
||||
%configure --disable-silent-rules --without-included-regex
|
||||
%endif
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
make check VERBOSE=1 %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make %{?_smp_mflags} DESTDIR=%{buildroot} install
|
||||
%if 0%{?suse_version} < 1120
|
||||
install -d %{buildroot}%{_bindir}
|
||||
ln -sf ../../bin/egrep %{buildroot}%{_bindir}/egrep
|
||||
ln -sf ../../bin/fgrep %{buildroot}%{_bindir}/fgrep
|
||||
ln -sf ../../bin/grep %{buildroot}%{_bindir}/grep
|
||||
%else
|
||||
%make_install
|
||||
#UsrMerge
|
||||
install -d %{buildroot}/bin
|
||||
ln -sf %{_bindir}/egrep %{buildroot}/bin/egrep
|
||||
ln -sf %{_bindir}/fgrep %{buildroot}/bin/fgrep
|
||||
ln -sf %{_bindir}/grep %{buildroot}/bin/grep
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%fdupes -s %{buildroot}
|
||||
%find_lang %{name}
|
||||
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/grep.info.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/grep.info%{ext_info}
|
||||
|
||||
%preun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/grep.info.gz
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/grep.info%{ext_info}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README AUTHORS NEWS THANKS TODO COPYING ChangeLog*
|
||||
%if 0%{?suse_version} < 1120
|
||||
/bin/*
|
||||
%else
|
||||
#UsrMerge
|
||||
/bin/egrep
|
||||
/bin/fgrep
|
||||
/bin/grep
|
||||
#EndUsrMerge
|
||||
%endif
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*%{ext_man}
|
||||
%{_infodir}/*%{ext_info}
|
||||
%{_bindir}/egrep
|
||||
%{_bindir}/fgrep
|
||||
%{_bindir}/grep
|
||||
%{_mandir}/man1/egrep.1%{ext_man}
|
||||
%{_mandir}/man1/fgrep.1%{ext_man}
|
||||
%{_mandir}/man1/grep.1%{ext_man}
|
||||
%{_infodir}/grep.info%{ext_info}
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user