Update to upstream version 1.1.3

- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
This commit is contained in:
Mikolaj Izdebski 2013-05-21 07:24:33 +02:00
parent e09d03d476
commit 421d88bcc3
3 changed files with 8 additions and 14 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
commons-logging-1.1.1-src.tar.gz commons-logging-1.1.1-src.tar.gz
/commons-logging-1.1.2-src.tar.gz /commons-logging-1.1.2-src.tar.gz
/commons-logging-1.1.3-src.tar.gz

View File

@ -3,8 +3,8 @@
%global short_name commons-%{base_name} %global short_name commons-%{base_name}
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.1.2 Version: 1.1.3
Release: 2%{?dist} Release: 1%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
Group: Development/Libraries 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 :cobertura-maven-plugin
%pom_remove_plugin :maven-scm-publish-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 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
%build %build
@ -134,6 +123,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Tue May 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-1
- Update to upstream version 1.1.3
- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
* Tue Apr 9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2 * Tue Apr 9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
- Set OSGi Bundle-SymbolicName to org.apache.commons.logging - Set OSGi Bundle-SymbolicName to org.apache.commons.logging
- Resolves: rhbz#949842 - Resolves: rhbz#949842

View File

@ -1 +1 @@
8928a44ded8fb362974fa303900773d6 commons-logging-1.1.2-src.tar.gz e8e197d628436490886d17cffa108fe3 commons-logging-1.1.3-src.tar.gz