|
|
b731d25 |
# READ BEFORE UPDATING: After updating this package to new upstream
|
|
|
b731d25 |
# version eclipse-ecf should be rebuilt. For more info, see:
|
|
|
b731d25 |
# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
|
|
|
b2b4590 |
|
|
|
b2b4590 |
%global base_name logging
|
|
|
b2b4590 |
%global short_name commons-%{base_name}
|
|
|
b2b4590 |
|
|
|
b2b4590 |
Name: apache-%{short_name}
|
|
|
71bb086 |
Version: 1.2
|
|
|
1531352 |
Release: 6%{?dist}
|
|
|
b2b4590 |
Summary: Apache Commons Logging
|
|
|
b2b4590 |
License: ASL 2.0
|
|
|
b2b4590 |
URL: http://commons.apache.org/%{base_name}
|
|
|
b2b4590 |
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
|
Stanislav Ochotnicky |
7db8532 |
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
|
|
Stanislav Ochotnicky |
e6f0c5a |
|
|
|
0ccbd40 |
Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch
|
|
|
1531352 |
Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch
|
|
|
0ccbd40 |
|
|
Stanislav Ochotnicky |
618917f |
BuildRequires: maven-local
|
|
|
789b784 |
BuildRequires: mvn(avalon-framework:avalon-framework-api)
|
|
|
789b784 |
BuildRequires: mvn(avalon-framework:avalon-framework-impl)
|
|
|
789b784 |
BuildRequires: mvn(javax.servlet:servlet-api)
|
|
|
789b784 |
BuildRequires: mvn(junit:junit)
|
|
|
789b784 |
BuildRequires: mvn(log4j:log4j)
|
|
|
789b784 |
BuildRequires: mvn(logkit:logkit)
|
|
|
8994abf |
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
|
|
b083637 |
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
|
|
|
b7edd16 |
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
|
|
b7edd16 |
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
|
|
789b784 |
|
|
|
12063d2 |
BuildArch: noarch
|
|
|
12063d2 |
|
|
|
bd922d7 |
|
|
|
b2b4590 |
%description
|
|
|
b2b4590 |
The commons-logging package provides a simple, component oriented
|
|
|
b2b4590 |
interface (org.apache.commons.logging.Log) together with wrappers for
|
|
|
b2b4590 |
logging systems. The user can choose at runtime which system they want
|
|
|
b2b4590 |
to use. In addition, a small number of basic implementations are
|
|
|
9a97dac |
provided to allow users to use the package standalone.
|
|
|
b2b4590 |
commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
|
|
|
b2b4590 |
commons-logging abstraction is meant to minimize the differences between
|
|
|
b2b4590 |
the two, and to allow a developer to not tie himself to a particular
|
|
|
b2b4590 |
logging implementation.
|
|
|
b2b4590 |
|
|
|
b2b4590 |
%package javadoc
|
|
|
b2b4590 |
Summary: API documentation for %{name}
|
|
|
b2b4590 |
|
|
|
b2b4590 |
%description javadoc
|
|
|
8b643ad |
%{summary}.
|
|
|
b2b4590 |
|
|
|
b2b4590 |
# -----------------------------------------------------------------------------
|
|
|
b2b4590 |
|
|
|
b2b4590 |
%prep
|
|
|
b2b4590 |
%setup -q -n %{short_name}-%{version}-src
|
|
|
0ccbd40 |
%patch0 -p1
|
|
|
1531352 |
%patch1 -p1
|
|
|
b2b4590 |
|
|
|
be4c09a |
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
|
|
|
be4c09a |
%pom_remove_dep :avalon-framework
|
|
|
8cf430a |
%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
|
|
|
be4c09a |
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
|
|
|
5822ede |
|
|
|
6acd3c6 |
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
|
|
|
6acd3c6 |
|
|
|
be4c09a |
%pom_remove_plugin :cobertura-maven-plugin
|
|
|
be4c09a |
%pom_remove_plugin :maven-scm-publish-plugin
|
|
|
b2b4590 |
|
|
|
be4c09a |
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
|
|
|
b2b4590 |
|
|
|
789b784 |
# for compatibility reasons
|
|
|
789b784 |
%mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
|
|
|
a89f5fb |
%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" "apache:%{short_name}@1"
|
|
|
789b784 |
|
|
|
75a3f45 |
# Remove log4j12 tests
|
|
|
75a3f45 |
rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
|
|
|
75a3f45 |
|
|
|
394f50d |
|
|
|
b2b4590 |
%build
|
|
|
789b784 |
%mvn_build
|
|
|
b2b4590 |
|
|
|
b2b4590 |
# -----------------------------------------------------------------------------
|
|
|
b2b4590 |
|
|
|
b2b4590 |
%install
|
|
|
789b784 |
%mvn_install
|
|
|
81e53d9 |
|
|
|
1531352 |
install -p -m 644 target/%{short_name}-%{version}-api.jar %{buildroot}/%{_javadir}/%{name}-api.jar
|
|
|
1531352 |
install -p -m 644 target/%{short_name}-%{version}-adapters.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
|
|
|
b2b4590 |
|
|
|
789b784 |
pushd %{buildroot}/%{_javadir}
|
|
|
789b784 |
for jar in %{name}-*; do
|
|
|
789b784 |
ln -sf ${jar} `echo ${jar}| sed "s|apache-||g"`
|
|
|
789b784 |
done
|
|
|
789b784 |
popd
|
|
|
b2b4590 |
|
|
|
789b784 |
install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
|
|
|
b2b4590 |
|
|
|
789b784 |
%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
|
|
|
b2b4590 |
|
|
|
789b784 |
%files -f .mfiles
|
|
|
016af29 |
%doc LICENSE.txt NOTICE.txt
|
|
|
be4c09a |
%doc PROPOSAL.html RELEASE-NOTES.txt
|
|
|
789b784 |
%{_javadir}/*%{short_name}-api.jar
|
|
|
789b784 |
%{_javadir}/*%{short_name}-adapters.jar
|
|
|
b2b4590 |
|
|
|
b2b4590 |
|
|
|
789b784 |
%files javadoc -f .mfiles-javadoc
|
|
|
016af29 |
%doc LICENSE.txt NOTICE.txt
|
|
|
b2b4590 |
|
|
|
b2b4590 |
# -----------------------------------------------------------------------------
|
|
|
b2b4590 |
|
|
|
b2b4590 |
%changelog
|
|
|
1531352 |
* Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
|
|
|
1531352 |
- Port to maven-jar-plugin 3.0.0
|
|
|
1531352 |
|
|
|
f259b04 |
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
|
|
|
f259b04 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
f259b04 |
|
|
|
a737675 |
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
|
|
|
a737675 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
a737675 |
|
|
|
a89f5fb |
* Mon Mar 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
|
|
|
a89f5fb |
- Add aliases for apache groupId
|
|
|
a89f5fb |
|
|
|
0ccbd40 |
* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
|
|
|
0ccbd40 |
- Generate different Bundle-SymbolicName for different JARs
|
|
|
0ccbd40 |
- Resolves: rhbz#1123055
|
|
|
0ccbd40 |
|
|
|
71bb086 |
* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
|
|
|
71bb086 |
- Update to upstream version 1.2
|
|
|
71bb086 |
|
|
|
5272664 |
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-13
|
|
|
5272664 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
5272664 |
|
|
|
75a3f45 |
* Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
|
|
|
75a3f45 |
- Disable tests that use log4j12
|
|
|
75a3f45 |
|
|
Stanislav Ochotnicky |
377a51c |
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
|
|
Stanislav Ochotnicky |
377a51c |
- Use Requires: java-headless rebuild (#1067528)
|
|
Stanislav Ochotnicky |
377a51c |
|
|
|
6acd3c6 |
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
|
|
|
6acd3c6 |
- Set logkit dependency scope to provided
|
|
|
6acd3c6 |
|
|
|
8cf430a |
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
|
|
|
8cf430a |
- Set avalon dependency scope to provided
|
|
|
8cf430a |
|
|
|
8a4bc2c |
* Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
|
|
|
8a4bc2c |
- Run all the tests agains
|
|
|
8a4bc2c |
|
|
|
12063d2 |
* Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
|
|
|
12063d2 |
- Make this package noarch again (Resolves: rhbz#995756)
|
|
|
12063d2 |
|
|
|
394f50d |
* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
|
|
|
394f50d |
- Temporarily remove test which fails in koji
|
|
|
394f50d |
|
|
|
b7edd16 |
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
|
|
|
b7edd16 |
- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
|
|
|
b7edd16 |
|
|
|
b083637 |
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
|
|
|
b083637 |
- Add missing BR: maven-failsafe-plugin
|
|
|
b083637 |
|
|
|
789b784 |
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
|
|
|
789b784 |
- Adapt to current guidelines
|
|
|
789b784 |
|
|
|
018f71e |
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
|
|
|
018f71e |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
|
018f71e |
|
|
|
421d88b |
* Tue May 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.3-1
|
|
|
421d88b |
- Update to upstream version 1.1.3
|
|
|
421d88b |
- Remove OSGi Bundle-SymbolicName patch (accepted upstream)
|
|
|
421d88b |
|
|
|
e09d03d |
* Tue Apr 9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
|
|
|
e09d03d |
- Set OSGi Bundle-SymbolicName to org.apache.commons.logging
|
|
|
e09d03d |
- Resolves: rhbz#949842
|
|
|
e09d03d |
|
|
|
be4c09a |
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
|
|
|
be4c09a |
- Update to upstream version 1.1.2
|
|
|
be4c09a |
- Convert POM to POM macros
|
|
|
be4c09a |
- Remove OSGi manifest patch; fixed upstream
|
|
|
be4c09a |
|
|
|
a4b1e1e |
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-23
|
|
|
a4b1e1e |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
a4b1e1e |
|
|
Stanislav Ochotnicky |
618917f |
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.1.1-22
|
|
Stanislav Ochotnicky |
618917f |
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
|
Stanislav Ochotnicky |
618917f |
- Replace maven BuildRequires with maven-local
|
|
Stanislav Ochotnicky |
618917f |
|
|
|
016af29 |
* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-21
|
|
|
016af29 |
- Install NOTICE file
|
|
|
016af29 |
- Resolves: rhbz#879581
|
|
|
016af29 |
|
|
|
532a09b |
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-20
|
|
|
532a09b |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
532a09b |
|
|
|
bd922d7 |
* Tue May 1 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-19
|
|
|
bd922d7 |
- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
|
|
|
bd922d7 |
|
|
|
7e7d17b |
* Mon Apr 30 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-18
|
|
|
7e7d17b |
- Fix build with latest libs.
|
|
|
7e7d17b |
- Adapt to current guidelines.
|
|
|
7e7d17b |
|
|
|
8474551 |
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
|
|
|
8474551 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
8474551 |
|
|
Stanislav Ochotnicky |
e6f0c5a |
* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-16
|
|
Stanislav Ochotnicky |
e6f0c5a |
- Build with maven 3
|
|
Stanislav Ochotnicky |
e6f0c5a |
- Fix build for avalon-framework
|
|
Stanislav Ochotnicky |
e6f0c5a |
|
|
|
24d1fdf |
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-15
|
|
|
24d1fdf |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
24d1fdf |
|
|
|
81e53d9 |
* Thu Dec 16 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-14
|
|
|
81e53d9 |
- Bring back commons-logging* symlinks.
|
|
|
81e53d9 |
|
|
Stanislav Ochotnicky |
7db8532 |
* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-13
|
|
Stanislav Ochotnicky |
7db8532 |
- Replace tomcat6 BR with servlet25 only
|
|
Stanislav Ochotnicky |
7db8532 |
- Cleanups according to new packaging guidelines
|
|
Stanislav Ochotnicky |
7db8532 |
- Install maven metadata for -api jar
|
|
Stanislav Ochotnicky |
7db8532 |
- Versionless jars/javadocs
|
|
Stanislav Ochotnicky |
7db8532 |
|
|
Stanislav Ochotnicky |
1e01d88 |
* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-12
|
|
Stanislav Ochotnicky |
1e01d88 |
- Add depmaps for api and adapters subpackages
|
|
Stanislav Ochotnicky |
1e01d88 |
- Use apache-commons-parent BR instead of maven-*
|
|
Stanislav Ochotnicky |
1e01d88 |
- Replace tomcat5 BR with tomcat6
|
|
Stanislav Ochotnicky |
1e01d88 |
- Reenable tests
|
|
Stanislav Ochotnicky |
1e01d88 |
|
|
|
0d60166 |
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-11
|
|
|
0d60166 |
- Add license to javadoc subpackage
|
|
|
0d60166 |
|
|
|
5822ede |
* Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10
|
|
|
5822ede |
- Add osgi manifest entries.
|
|
|
5822ede |
|
|
|
686fe99 |
* Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-9
|
|
|
686fe99 |
- Correct depmap filename for backward compatibility
|
|
|
686fe99 |
|
|
|
0c00d3e |
* Mon May 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-8
|
|
|
0c00d3e |
- Fix wrong depmap JPP name to short_name
|
|
|
9a97dac |
- Add obsoletes to javadoc subpackage
|
|
|
9a97dac |
|
|
|
cd4e9a3 |
* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7
|
|
|
cd4e9a3 |
- Fix symlink problems introduced previously in r5
|
|
|
cd4e9a3 |
|
|
|
24992d4 |
* Tue May 11 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-6
|
|
|
24992d4 |
- Add one more add_to_maven_depmap for backward compatibility
|
|
|
24992d4 |
|
|
|
8b643ad |
* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-5
|
|
|
8b643ad |
- Fix up add_to_maven_depmap
|
|
|
8b643ad |
- Add jpackage-utils Requires for javadoc
|
|
|
8b643ad |
- Cleanup install a bit
|
|
|
8b643ad |
|
|
|
1be39eb |
* Fri May 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-4
|
|
|
1be39eb |
- Fix provides
|
|
|
1be39eb |
|
|
|
b2b4590 |
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-3
|
|
|
b2b4590 |
- Revert to using default permissions
|
|
|
b2b4590 |
- Drop "Package" from summary, improve javadoc summary text
|
|
|
b2b4590 |
|
|
|
b2b4590 |
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-2
|
|
|
b2b4590 |
- Fix EOLs on docs
|
|
|
b2b4590 |
- Create javadoc symlinks during install
|
|
|
b2b4590 |
- Use version macro in Source0 URL, use _mavenpomdir macro
|
|
|
b2b4590 |
|
|
|
b2b4590 |
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-1
|
|
|
b2b4590 |
- Rename and rebase from jakarta-commons-logging
|