diff --git a/.gitignore b/.gitignore index 8ea02b0..fa99b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ commons-logging-1.1.1-src.tar.gz /commons-logging-1.1.2-src.tar.gz +/commons-logging-1.1.3-src.tar.gz diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 8d46c54..4af0900 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -3,8 +3,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -67,17 +67,6 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-scm-publish-plugin -# Upstream is changing Maven groupID and OSGi Bundle-SymbolicName back -# and forth, even between minor releases (such as 1.1.1 and 1.1.2). -# In case of Maven we can provide an alias, so that's not a big -# problem. But there is no alias mechanism for OSGi bundle names. -# -# I'll use Bundle-SymbolicName equal to "org.apache.commons.logging" -# because that's what upstream decided to use in future and because -# that's what most of Eclipse plugin are already using. See also -# rhbz#949842 and LOGGING-151. mizdebsk, 9 Apr 2013 -%pom_xpath_set pom:commons.osgi.symbolicName org.apache.commons.logging - sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt %build @@ -134,6 +123,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Tue May 21 2013 Mikolaj Izdebski - 1.1.3-1 +- Update to upstream version 1.1.3 +- Remove OSGi Bundle-SymbolicName patch (accepted upstream) + * Tue Apr 9 2013 Mikolaj Izdebski - 1.1.2-2 - Set OSGi Bundle-SymbolicName to org.apache.commons.logging - Resolves: rhbz#949842 diff --git a/sources b/sources index 513fce3..95751b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8928a44ded8fb362974fa303900773d6 commons-logging-1.1.2-src.tar.gz +e8e197d628436490886d17cffa108fe3 commons-logging-1.1.3-src.tar.gz