From 2b3783f09d428b35a1ada81528b1f395721b8966 Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Thu, 25 Oct 2012 18:20:08 +0100
Subject: [PATCH] Update to latest version 1.7

---
 .gitignore                |  4 ++--
 apache-commons-codec.spec | 13 +++++++------
 sources                   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27b86ff..9ecff87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-commons-codec-1.4-src.tar.gz
-commons-codec-1.6-src.tar.gz
+/.project
+/commons-codec-1.7-src.tar.gz
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 905f425..e99ef54 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -2,8 +2,8 @@
 %global short_name commons-%{base_name}
 
 Name:          apache-%{short_name}
-Version:       1.6
-Release:       5%{?dist}
+Version:       1.7
+Release:       1%{?dist}
 Summary:       Implementations of common encoders and decoders
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -31,9 +31,7 @@ BuildRequires: maven-surefire-provider-junit4
 Requires:      java >= 1:1.6.0
 Requires:      jpackage-utils
 
-Provides:      jakarta-%{short_name} = %{version}-%{release}
-Obsoletes:     jakarta-%{short_name} < %{version}-%{release}
-# It looks like there are packages in F-13 that BR/R the short name
+# It looks like there are packages in F-18 that BR/R the short name
 Provides:      %{short_name} = %{version}-%{release}
 Obsoletes:     %{short_name} < %{version}-%{release}
 
@@ -46,7 +44,6 @@ Phonetic and URLs.
 Summary:       API documentation for %{name}
 Group:         Documentation
 Requires:      jpackage-utils
-Obsoletes:     jakarta-%{short_name}-javadoc < %{version}-%{release}
 
 %description javadoc
 %{summary}.
@@ -86,6 +83,10 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 25 2012 Mat Booth <fedora@matbooth.co.uk> - 1.7-1
+- Update to 1.7.
+- Can finally remove the provides/obsoletes on the old jakarta name.
+
 * Mon Sep 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-5
 - Restore apache-commons-codec.jar symlink, resolves #857947
 
diff --git a/sources b/sources
index e912780..4f5a606 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e482c7567908d334785ce7d69ddfff7  commons-codec-1.6-src.tar.gz
+9532b9247c71475d12350e36b721c366  commons-codec-1.7-src.tar.gz