Update to 2.2

- Remove rpm bug workaround
- Finalize renaming from jakarta-comons-io

.gitignore

@@ -2,3 +2,4 @@ commons-io-1.4-src.tar.gz
 /commons-io-2.0-src.tar.gz
 /commons-io-2.0.1-src.tar.gz
 commons-io-2.1-src.tar.gz
+/commons-io-2.2-src.tar.gz

apache-commons-io.spec

@@ -2,8 +2,8 @@
 %global short_name      commons-%{base_name}
 
 Name:             apache-%{short_name}
-Version:          2.1
+Version:          2.2
-Release:          2%{?dist}
+Release:          1%{?dist}
 Epoch:            1
 Summary:          Utilities to assist with developing IO functionality
 License:          ASL 2.0
@@ -22,10 +22,6 @@ BuildRequires:    apache-commons-parent
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 
-# This should go away with F-17
-Provides:         jakarta-%{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes:        jakarta-%{short_name} <= 0:1.4
-
 %description
 Commons-IO contains utility classes, stream implementations,
 file filters, and endian classes. It is a library of utilities
@@ -36,8 +32,6 @@ Summary:          API documentation for %{name}
 Group:            Documentation
 Requires:         jpackage-utils
 
-Obsoletes:        jakarta-%{short_name}-javadoc <= 0:1.4
-
 %description javadoc
 This package contains the API documentation for %{name}.
 
@@ -65,11 +59,6 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
 %files
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*.jar
@@ -81,6 +70,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Apr 4 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.2-1
+- Update to 2.2
+- Remove rpm bug workaround
+- Finalize renaming from jakarta-comons-io
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

sources

@@ -1 +1 @@
-603b7c2205d48ab99774e669a4baa8f7  commons-io-2.1-src.tar.gz
+d2dbb604339bc1d9520b5a15e93abc1f  commons-io-2.2-src.tar.gz