diff --git a/.cvsignore b/.cvsignore index 6deb654..bc50034 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -sed-4.1.4.tar.gz -sed-4.1.5.tar.gz +sed-4.2.1.tar.gz diff --git a/sed-4.2.1-dummyparam.diff b/sed-4.2.1-dummyparam.diff new file mode 100644 index 0000000..55c9197 --- /dev/null +++ b/sed-4.2.1-dummyparam.diff @@ -0,0 +1,25 @@ +--- sed-4.2.1/sed/sed.c 2009-06-03 21:10:51.000000000 +0200 ++++ sed-4.2.1_copy/sed/sed.c 2009-06-30 14:12:28.000000000 +0200 +@@ -174,11 +174,11 @@ main(argc, argv) + char **argv; + { + #ifdef REG_PERL +-#define SHORTOPTS "bsnrRuEe:f:l:i::V:" ++#define SHORTOPTS "cbsnrRuEe:f:l:i::V:" + #else +-#define SHORTOPTS "bsnruEe:f:l:i::V:" ++#define SHORTOPTS "cbsnruEe:f:l:i::V:" + #endif +- ++/* -c --copy is just a dummy param to keep backward compatibility */ + static struct option longopts[] = { + {"binary", 0, NULL, 'b'}, + {"regexp-extended", 0, NULL, 'r'}, +@@ -196,6 +196,7 @@ main(argc, argv) + {"unbuffered", 0, NULL, 'u'}, + {"version", 0, NULL, 'v'}, + {"help", 0, NULL, 'h'}, ++ {"copy", 0, NULL, 'c'}, + #ifdef ENABLE_FOLLOW_SYMLINKS + {"follow-symlinks", 0, NULL, 'F'}, + #endif diff --git a/sed.spec b/sed.spec index 0b606d3..89da414 100644 --- a/sed.spec +++ b/sed.spec @@ -5,16 +5,14 @@ Summary: A GNU stream text editor Name: sed -Version: 4.1.5 -Release: 12%{?dist} +Version: 4.2.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Text URL: http://sed.sourceforge.net/ Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz Source1: http://sed.sourceforge.net/sedfaq.txt -Patch0: sed-4.1.5-utf8performance.patch -Patch1: sed-4.1.5-follow.patch -Patch2: sed-4.1.5-copy.patch +Patch0: sed-4.2.1-dummyparam.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel Requires(post): /sbin/install-info @@ -30,8 +28,6 @@ specified in a script file or from the command line. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --without-included-regex @@ -70,6 +66,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man*/* %changelog +* Mon Jun 29 2009 Jiri Moskovcak - 4.2.1-1 +- new version +- obsoletes previous patches +- added patch to maintain backwards compatibility for scripts using -c/--copy +- Resolves: #502934 + * Wed Feb 25 2009 Fedora Release Engineering - 4.1.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 18f881e..fbb079b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a1cbbbb3341287308e140bd4834c3ba sed-4.1.5.tar.gz +f0fd4d7da574d4707e442285fd2d3b86 sed-4.2.1.tar.gz