import sources
This commit is contained in:
Adam Samalik
parent
1d1c789687
commit
9d86ea7268
|
|
@ -1 +1,2 @@
|
|||
SOURCES/commons-logging-1.1.2-src.tar.gz
|
||||
/commons-logging-1.2-src.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,35 +1,32 @@
|
|||
%bcond_without avalon
|
||||
|
||||
%global base_name logging
|
||||
%global short_name commons-%{base_name}
|
||||
|
||||
Name: apache-%{short_name}
|
||||
Version: 1.1.2
|
||||
Release: 7%{?dist}
|
||||
Name: apache-commons-logging
|
||||
Version: 1.2
|
||||
Release: 13%{?dist}
|
||||
Summary: Apache Commons Logging
|
||||
License: ASL 2.0
|
||||
Group: Development/Libraries
|
||||
URL: http://commons.apache.org/%{base_name}
|
||||
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
|
||||
|
||||
URL: http://commons.apache.org/logging
|
||||
BuildArch: noarch
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
BuildRequires: avalon-framework >= 4.3
|
||||
BuildRequires: avalon-logkit
|
||||
BuildRequires: apache-commons-parent >= 26-7
|
||||
BuildRequires: maven-dependency-plugin
|
||||
BuildRequires: maven-failsafe-plugin
|
||||
BuildRequires: maven-plugin-build-helper
|
||||
BuildRequires: maven-release-plugin
|
||||
BuildRequires: maven-site-plugin
|
||||
BuildRequires: maven-resources-plugin
|
||||
BuildRequires: servlet
|
||||
|
||||
# This should go away with F-17
|
||||
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} <= 0:1.0.4
|
||||
Source0: http://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz
|
||||
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom
|
||||
|
||||
Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch
|
||||
Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
%if %{with avalon}
|
||||
BuildRequires: mvn(avalon-framework:avalon-framework-api)
|
||||
BuildRequires: mvn(avalon-framework:avalon-framework-impl)
|
||||
BuildRequires: mvn(logkit:logkit)
|
||||
%endif
|
||||
BuildRequires: mvn(javax.servlet:servlet-api)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(log4j:log4j:12)
|
||||
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||
|
||||
%description
|
||||
The commons-logging package provides a simple, component oriented
|
||||
|
|
@ -42,97 +39,133 @@ commons-logging abstraction is meant to minimize the differences between
|
|||
the two, and to allow a developer to not tie himself to a particular
|
||||
logging implementation.
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
Group: Documentation
|
||||
|
||||
Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
%{?javadoc_package}
|
||||
|
||||
%prep
|
||||
%setup -q -n %{short_name}-%{version}-src
|
||||
|
||||
# SecurityAllowedTestCase fails, probably due to environmental hazard
|
||||
# See: rhbz#1056462, https://issues.apache.org/jira/browse/LOGGING-156
|
||||
find -name SecurityAllowedTestCase.java -delete
|
||||
%autosetup -p1 -n commons-logging-%{version}-src
|
||||
|
||||
%if %{with avalon}
|
||||
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
|
||||
%pom_remove_dep :avalon-framework
|
||||
%pom_add_dep avalon-framework:avalon-framework-api:4.3
|
||||
%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
|
||||
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
|
||||
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
|
||||
|
||||
%else
|
||||
%pom_remove_dep -r :avalon-framework
|
||||
%pom_remove_dep -r :logkit
|
||||
rm -r src/test/java/org/apache/commons/logging/{avalon,logkit}
|
||||
rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
|
||||
rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
|
||||
%endif
|
||||
|
||||
%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
|
||||
|
||||
%mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
|
||||
%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1"
|
||||
# for compatibility reasons
|
||||
%mvn_file ":commons-logging{*}" "commons-logging@1" "%{name}@1"
|
||||
%mvn_alias ":commons-logging{*}" "org.apache.commons:commons-logging@1" "apache:commons-logging@1"
|
||||
|
||||
# Remove log4j12 tests
|
||||
rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# The build produces more artifacts from one pom
|
||||
%mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar
|
||||
%mvn_artifact commons-logging:commons-logging-adapters:%{version} target/commons-logging-%{version}-adapters.jar
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
install -p -m 644 target/%{short_name}-api-%{version}.jar %{buildroot}/%{_javadir}/%{name}-api.jar
|
||||
install -p -m 644 target/%{short_name}-adapters-%{version}.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
|
||||
|
||||
pushd %{buildroot}/%{_javadir}
|
||||
for jar in %{name}-*; do
|
||||
ln -sf ${jar} `echo ${jar}| sed "s|apache-||g"`
|
||||
done
|
||||
popd
|
||||
|
||||
install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
|
||||
|
||||
%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%license LICENSE.txt NOTICE.txt
|
||||
%doc PROPOSAL.html RELEASE-NOTES.txt
|
||||
%{_javadir}/*%{short_name}-api.jar
|
||||
%{_javadir}/*%{short_name}-adapters.jar
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-7
|
||||
- Remove unit test as a workaround for upstream bug LOGGING-156
|
||||
- Resolves: rhbz#1056462
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.1.2-6
|
||||
- Mass rebuild 2013-12-27
|
||||
* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-12
|
||||
- Cleanup spec file
|
||||
|
||||
* Fri Sep 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-5
|
||||
- Add BuildRequires on apache-commons-parent >= 26-7
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Aug 27 2013 Michal Srb <msrb@redhat.com> - 1.1.2-4
|
||||
- Migrate away from mvn-rpmbuild (Resolves: #997523)
|
||||
* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 1.2-10
|
||||
- Avoid %%add_maven_depmap
|
||||
|
||||
* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-3
|
||||
- Rebuild to regenerate API documentation
|
||||
- Resolves: CVE-2013-1571
|
||||
* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
|
||||
- Fix conditional
|
||||
|
||||
* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
|
||||
- Use log4j12
|
||||
- Add avalon conditional
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
|
||||
- Port to maven-jar-plugin 3.0.0
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Mar 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
|
||||
- Add aliases for apache groupId
|
||||
|
||||
* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
|
||||
- Generate different Bundle-SymbolicName for different JARs
|
||||
- Resolves: rhbz#1123055
|
||||
|
||||
* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
|
||||
- Update to upstream version 1.2
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
|
||||
- Disable tests that use log4j12
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
|
||||
- Set logkit dependency scope to provided
|
||||
|
||||
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
|
||||
- Set avalon dependency scope to provided
|
||||
|
||||
* Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
|
||||
- Run all the tests agains
|
||||
|
||||
* Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
|
||||
- Make this package noarch again (Resolves: rhbz#995756)
|
||||
|
||||
* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
|
||||
- Temporarily remove test which fails in koji
|
||||
|
||||
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
|
||||
- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
|
||||
|
||||
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
|
||||
- Add missing BR: maven-failsafe-plugin
|
||||
|
||||
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
|
||||
- Adapt to current guidelines
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* 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
|
||||
- Set OSGi Bundle-SymbolicName to org.apache.commons.logging
|
||||
|
|
|
|||
Loading…
Reference in New Issue