Set OSGi Bundle-SymbolicName to org.apache.commons.logging

This commit is contained in:
Mikolaj Izdebski 2013-04-09 12:36:44 +02:00
parent be4c09ab80
commit e09d03d476

View File

@ -4,7 +4,7 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.1.2 Version: 1.1.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
Group: Development/Libraries Group: Development/Libraries
@ -67,6 +67,17 @@ 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
@ -123,6 +134,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Tue Apr 9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
- Set OSGi Bundle-SymbolicName to org.apache.commons.logging
- Resolves: rhbz#949842
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1 * Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
- Update to upstream version 1.1.2 - Update to upstream version 1.1.2
- Convert POM to POM macros - Convert POM to POM macros