rpms/patch/devel patch-2.6.1.tar.xz.sig, NONE, 1.1 .cvsignore, 1.3, 1.4 patch.spec, 1.42, 1.43 sources, 1.3, 1.4 patch-2.6.tar.xz.sig, 1.1, NONE patch-best-name.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/patch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7306

Modified Files:
	.cvsignore patch.spec sources 
Added Files:
	patch-2.6.1.tar.xz.sig 
Removed Files:
	patch-2.6.tar.xz.sig patch-best-name.patch 
Log Message:
* Mon Jan  4 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-1
- 2.6.1 (bug #551569).  No longer need best-name patch.



--- NEW FILE patch-2.6.1.tar.xz.sig ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.12 (GNU/Linux)

iEYEABECAAYFAks7frsACgkQ9+hy/rlxVNONpwCgr0yqYFoW0Q1USWGBcA8dGNEn
XUMAn1RB5jT/EoiNi9ZrjawqxAT83JzB
=/8JO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 Nov 2009 10:04:57 -0000	1.3
+++ .cvsignore	4 Jan 2010 13:10:46 -0000	1.4
@@ -1,2 +1,3 @@
 patch-2.5.4.tar.gz
 patch-2.6.tar.xz
+patch-2.6.1.tar.xz


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/patch.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- patch.spec	24 Dec 2009 14:06:35 -0000	1.42
+++ patch.spec	4 Jan 2010 13:10:46 -0000	1.43
@@ -1,17 +1,17 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
-Version: 2.6
-Release: 2%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch1: patch-2.5.4-sigsegv.patch
-Patch2: patch-best-name.patch
 Patch100: patch-selinux.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
+BuildRequires: ed
 
 %description
 The patch program applies diff files to originals.  The diff command
@@ -26,7 +26,6 @@ applications.
 %prep
 %setup -q
 %patch1 -p1 -b .sigsegv
-%patch2 -p1 -b .best-name
 %patch100 -p1 -b .selinux
 
 %build
@@ -57,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Mon Jan  4 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-1
+- 2.6.1 (bug #551569).  No longer need best-name patch.
+
 * Thu Dec 24 2009 Tim Waugh <twaugh at redhat.com> 2.6-2
 - Applied upstream patch to prevent incorrect filename being chosen
   when adding a new file (bug #549122).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/patch/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Nov 2009 10:05:01 -0000	1.3
+++ sources	4 Jan 2010 13:10:46 -0000	1.4
@@ -1,2 +1 @@
-ee5ae84d115f051d87fcaaef3b4ae782  patch-2.5.4.tar.gz
-d9d62cb7b98a8a17e42dab910fd2adc9  patch-2.6.tar.xz
+057d78436e858c3ed086a544f5e1fe7e  patch-2.6.1.tar.xz


--- patch-2.6.tar.xz.sig DELETED ---


--- patch-best-name.patch DELETED ---