Rebase to sed 4.5

-resolves #1562608
This commit is contained in:
Jakub Martisko 2018-04-03 13:29:18 +02:00
parent 49643044e4
commit 0b87a8acdf
3 changed files with 13 additions and 8 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ sed-4.2.1.tar.bz2
/sed-4.2.2.tar.bz2 /sed-4.2.2.tar.bz2
/sed-4.3.tar.xz /sed-4.3.tar.xz
/sed-4.4.tar.xz /sed-4.4.tar.xz
/sed-4.5.tar.xz

View File

@ -2,15 +2,15 @@
Summary: A GNU stream text editor Summary: A GNU stream text editor
Name: sed Name: sed
Version: 4.4 Version: 4.5
Release: 7%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Text Group: Applications/Text
URL: http://sed.sourceforge.net/ URL: http://sed.sourceforge.net/
Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz
Source1: http://sed.sourceforge.net/sedfaq.txt Source1: http://sed.sourceforge.net/sedfaq.txt
Patch0: sed-4.2.2-binary_copy_args.patch Patch0: sed-4.2.2-binary_copy_args.patch
Patch1: sed-selinux.patch #Patch1: sed-selinux.patch
#Build failure with glibc-2.28 #Build failure with glibc-2.28
#https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html #https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
Patch2: sed-gnulib.patch Patch2: sed-gnulib.patch
@ -34,8 +34,8 @@ specified in a script file or from the command line.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .copy %patch0 -p1 -b .copy
%patch1 -p1 -b .selinux #%patch1 -p1 -b .selinux
%patch2 -p1 -b .gnulib #%patch2 -p1 -b .gnulib
%build %build
%configure --without-included-regex %configure --without-included-regex
@ -75,10 +75,14 @@ fi
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Thu Mar 08 2018 Jakub Martiso <jamartis@redhat.com> - 4.4-7 * Tue Apr 03 2018 Jakub Martisko <jamartis@redhat.com> - 4.5-1
- Rebase to 4.5
- Drop patches from 4.4-4 and 4.4-7
* Thu Mar 08 2018 Jakub Martisko <jamartis@redhat.com> - 4.4-7
- Fix build failure with glibc-2.28 - Fix build failure with glibc-2.28
* Thu Mar 08 2018 Jakub Martiso <jamartis@redhat.com> - 4.4-6 * Thu Mar 08 2018 Jakub Martisko <jamartis@redhat.com> - 4.4-6
- Add gcc to BuildRequires - Add gcc to BuildRequires
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-5 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-5

View File

@ -1 +1 @@
SHA512 (sed-4.4.tar.xz) = 4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70 SHA512 (sed-4.5.tar.xz) = f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196