Merge branch 'master' into f13

2011-02-10 16:04:06 +00:00 · 2011-02-10 16:04:06 +00:00 · fbdd2c234d
commit fbdd2c234d
parent 32992625e3 7e946440f9
5 changed files with 10 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@ patchutils-0.2.30.tar.bz2
 patchutils-0.2.31.tar.bz2
 patchutils-0.3.0.tar.bz2
 patchutils-0.3.1.tar.bz2
+/patchutils-0.3.2.tar.bz2
--- a/patchutils-0.3.1.tar.bz2.sig
+++ b/patchutils-0.3.1.tar.bz2.sig
--- a/patchutils-0.3.2.tar.bz2.sig
+++ b/patchutils-0.3.2.tar.bz2.sig
--- a/patchutils.spec
+++ b/patchutils.spec
@ -1,7 +1,7 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
-Version: 0.3.1
-Release: 3%{?dist}
+Version: 0.3.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://cyberelk.net/tim/patchutils/
@ -45,6 +45,12 @@ rm -rf %{buildroot}
 %{_mandir}/*/*

 %changelog
+* Thu Feb 10 2011 Tim Waugh <twaugh@redhat.com> 0.3.2-1
+- 0.3.2.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-3fd9bca58a429fbbb1c2126f1b72aa23  patchutils-0.3.1.tar.bz2
+74607b4a28c9009c6aeeed0e91098917  patchutils-0.3.2.tar.bz2