2015-02-25 17:05:48 +00:00
|
|
|
# READ BEFORE UPDATING: After updating this package to new upstream
|
|
|
|
|
# version eclipse-ecf should be rebuilt. For more info, see:
|
|
|
|
|
# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
|
%global base_name logging
|
|
|
|
|
%global short_name commons-%{base_name}
|
|
|
|
|
|
|
|
|
|
Name: apache-%{short_name}
|
2014-07-20 09:30:22 +00:00
|
|
|
Version: 1.2
|
2017-02-10 06:05:04 +00:00
|
|
|
Release: 7%{?dist}
|
2010-05-07 07:10:04 +00:00
|
|
|
Summary: Apache Commons Logging
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
URL: http://commons.apache.org/%{base_name}
|
|
|
|
|
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
2010-12-16 15:37:14 +00:00
|
|
|
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
|
2011-04-21 12:07:33 +00:00
|
|
|
|
2014-07-30 10:50:24 +00:00
|
|
|
Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch
|
2016-05-31 08:52:52 +00:00
|
|
|
Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch
|
2014-07-30 10:50:24 +00:00
|
|
|
|
2013-02-06 18:32:04 +00:00
|
|
|
BuildRequires: maven-local
|
2013-08-05 16:27:49 +00:00
|
|
|
BuildRequires: mvn(avalon-framework:avalon-framework-api)
|
|
|
|
|
BuildRequires: mvn(avalon-framework:avalon-framework-impl)
|
|
|
|
|
BuildRequires: mvn(javax.servlet:servlet-api)
|
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
|
BuildRequires: mvn(log4j:log4j)
|
|
|
|
|
BuildRequires: mvn(logkit:logkit)
|
2014-07-20 10:52:14 +00:00
|
|
|
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
2013-08-05 16:54:02 +00:00
|
|
|
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
|
2013-08-05 17:11:21 +00:00
|
|
|
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
|
|
|
|
|
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
2013-08-05 16:27:49 +00:00
|
|
|
|
2013-08-11 08:32:21 +00:00
|
|
|
BuildArch: noarch
|
|
|
|
|
|
2012-04-30 21:19:10 +00:00
|
|
|
|
2010-05-07 07:10:04 +00:00
|
|
|
%description
|
|
|
|
|
The commons-logging package provides a simple, component oriented
|
|
|
|
|
interface (org.apache.commons.logging.Log) together with wrappers for
|
|
|
|
|
logging systems. The user can choose at runtime which system they want
|
|
|
|
|
to use. In addition, a small number of basic implementations are
|
2010-05-12 12:21:12 +00:00
|
|
|
provided to allow users to use the package standalone.
|
2010-05-07 07:10:04 +00:00
|
|
|
commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
|
|
|
|
|
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}
|
|
|
|
|
|
|
|
|
|
%description javadoc
|
2010-05-11 08:52:55 +00:00
|
|
|
%{summary}.
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -n %{short_name}-%{version}-src
|
2014-07-30 10:50:24 +00:00
|
|
|
%patch0 -p1
|
2016-05-31 08:52:52 +00:00
|
|
|
%patch1 -p1
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-04-08 03:57:58 +00:00
|
|
|
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
|
|
|
|
|
%pom_remove_dep :avalon-framework
|
2014-02-20 13:54:44 +00:00
|
|
|
%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
|
2013-04-08 03:57:58 +00:00
|
|
|
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
|
2010-06-09 18:08:45 +00:00
|
|
|
|
2014-02-20 15:24:15 +00:00
|
|
|
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
|
|
|
|
|
|
2013-04-08 03:57:58 +00:00
|
|
|
%pom_remove_plugin :cobertura-maven-plugin
|
|
|
|
|
%pom_remove_plugin :maven-scm-publish-plugin
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-04-08 03:57:58 +00:00
|
|
|
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
# for compatibility reasons
|
|
|
|
|
%mvn_file ":%{short_name}{*}" "%{short_name}@1" "%{name}@1"
|
2015-03-09 13:13:02 +00:00
|
|
|
%mvn_alias ":%{short_name}{*}" "org.apache.commons:%{short_name}@1" "apache:%{short_name}@1"
|
2013-08-05 16:27:49 +00:00
|
|
|
|
2014-05-13 12:21:36 +00:00
|
|
|
# Remove log4j12 tests
|
|
|
|
|
rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
|
|
|
|
|
|
2013-08-06 06:46:27 +00:00
|
|
|
|
2010-05-07 07:10:04 +00:00
|
|
|
%build
|
2013-08-05 16:27:49 +00:00
|
|
|
%mvn_build
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
%install
|
2013-08-05 16:27:49 +00:00
|
|
|
%mvn_install
|
2010-12-16 21:26:37 +00:00
|
|
|
|
2016-05-31 08:52:52 +00:00
|
|
|
install -p -m 644 target/%{short_name}-%{version}-api.jar %{buildroot}/%{_javadir}/%{name}-api.jar
|
|
|
|
|
install -p -m 644 target/%{short_name}-%{version}-adapters.jar %{buildroot}/%{_javadir}/%{name}-adapters.jar
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
pushd %{buildroot}/%{_javadir}
|
|
|
|
|
for jar in %{name}-*; do
|
|
|
|
|
ln -sf ${jar} `echo ${jar}| sed "s|apache-||g"`
|
|
|
|
|
done
|
|
|
|
|
popd
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
%files -f .mfiles
|
2012-11-22 20:31:35 +00:00
|
|
|
%doc LICENSE.txt NOTICE.txt
|
2013-04-08 03:57:58 +00:00
|
|
|
%doc PROPOSAL.html RELEASE-NOTES.txt
|
2013-08-05 16:27:49 +00:00
|
|
|
%{_javadir}/*%{short_name}-api.jar
|
|
|
|
|
%{_javadir}/*%{short_name}-adapters.jar
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
%files javadoc -f .mfiles-javadoc
|
2012-11-22 20:31:35 +00:00
|
|
|
%doc LICENSE.txt NOTICE.txt
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
%changelog
|
2017-02-10 06:05:04 +00:00
|
|
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
|
|
|
2016-05-31 08:52:52 +00:00
|
|
|
* Tue May 31 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
|
|
|
|
|
- Port to maven-jar-plugin 3.0.0
|
|
|
|
|
|
2016-02-03 16:18:23 +00:00
|
|
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
|
|
|
2015-06-17 00:04:05 +00:00
|
|
|
* 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
|
|
|
|
|
|
2015-03-09 13:13:02 +00:00
|
|
|
* Mon Mar 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-3
|
|
|
|
|
- Add aliases for apache groupId
|
|
|
|
|
|
2014-07-30 10:50:24 +00:00
|
|
|
* Tue Jul 29 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-2
|
|
|
|
|
- Generate different Bundle-SymbolicName for different JARs
|
|
|
|
|
- Resolves: rhbz#1123055
|
|
|
|
|
|
2014-07-20 09:30:22 +00:00
|
|
|
* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
|
|
|
|
|
- Update to upstream version 1.2
|
|
|
|
|
|
2014-06-07 00:58:41 +00:00
|
|
|
* 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
|
|
|
|
|
|
2014-05-13 12:21:36 +00:00
|
|
|
* Tue May 13 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-12
|
|
|
|
|
- Disable tests that use log4j12
|
|
|
|
|
|
2014-03-04 08:04:58 +00:00
|
|
|
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.3-11
|
|
|
|
|
- Use Requires: java-headless rebuild (#1067528)
|
|
|
|
|
|
2014-02-20 15:24:15 +00:00
|
|
|
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-10
|
|
|
|
|
- Set logkit dependency scope to provided
|
|
|
|
|
|
2014-02-20 13:54:44 +00:00
|
|
|
* Thu Feb 20 2014 Michael Simacek <msimacek@redhat.com> - 1.1.3-9
|
|
|
|
|
- Set avalon dependency scope to provided
|
|
|
|
|
|
2014-01-22 10:11:22 +00:00
|
|
|
* Wed Jan 22 2014 Michal Srb <msrb@redhat.com> - 1.1.3-8
|
|
|
|
|
- Run all the tests agains
|
|
|
|
|
|
2013-08-11 08:32:21 +00:00
|
|
|
* Sun Aug 11 2013 Michal Srb <msrb@redhat.com> - 1.1.3-7
|
|
|
|
|
- Make this package noarch again (Resolves: rhbz#995756)
|
|
|
|
|
|
2013-08-06 06:46:27 +00:00
|
|
|
* Tue Aug 06 2013 Michal Srb <msrb@redhat.com> - 1.1.3-6
|
|
|
|
|
- Temporarily remove test which fails in koji
|
|
|
|
|
|
2013-08-05 17:11:21 +00:00
|
|
|
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-5
|
|
|
|
|
- Add missing BR: maven-dependency-plugin, build-helper-maven-plugin
|
|
|
|
|
|
2013-08-05 16:54:02 +00:00
|
|
|
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-4
|
|
|
|
|
- Add missing BR: maven-failsafe-plugin
|
|
|
|
|
|
2013-08-05 16:27:49 +00:00
|
|
|
* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.1.3-3
|
|
|
|
|
- Adapt to current guidelines
|
|
|
|
|
|
2013-08-03 01:20:19 +00:00
|
|
|
* 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
|
|
|
|
|
|
2013-05-21 05:24:33 +00:00
|
|
|
* 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)
|
|
|
|
|
|
2013-04-09 10:36:44 +00:00
|
|
|
* 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
|
|
|
|
|
|
2013-04-08 03:57:58 +00:00
|
|
|
* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
|
|
|
|
|
- Update to upstream version 1.1.2
|
|
|
|
|
- Convert POM to POM macros
|
|
|
|
|
- Remove OSGi manifest patch; fixed upstream
|
|
|
|
|
|
2013-02-13 16:46:35 +00:00
|
|
|
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-23
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
|
|
|
2013-02-06 18:32:04 +00:00
|
|
|
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.1.1-22
|
|
|
|
|
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
|
|
|
|
- Replace maven BuildRequires with maven-local
|
|
|
|
|
|
2012-11-22 20:31:35 +00:00
|
|
|
* Thu Nov 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-21
|
|
|
|
|
- Install NOTICE file
|
|
|
|
|
- Resolves: rhbz#879581
|
|
|
|
|
|
2012-07-18 16:17:03 +00:00
|
|
|
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-20
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
|
|
|
2012-04-30 21:19:10 +00:00
|
|
|
* Tue May 1 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-19
|
|
|
|
|
- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
|
|
|
|
|
|
2012-04-30 14:30:00 +00:00
|
|
|
* Mon Apr 30 2012 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-18
|
|
|
|
|
- Fix build with latest libs.
|
|
|
|
|
- Adapt to current guidelines.
|
|
|
|
|
|
2012-01-12 21:36:11 +00:00
|
|
|
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
|
|
|
2011-04-21 12:07:33 +00:00
|
|
|
* Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-16
|
|
|
|
|
- Build with maven 3
|
|
|
|
|
- Fix build for avalon-framework
|
|
|
|
|
|
2011-02-08 01:33:42 +00:00
|
|
|
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-15
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
|
|
|
2010-12-16 21:26:37 +00:00
|
|
|
* Thu Dec 16 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-14
|
|
|
|
|
- Bring back commons-logging* symlinks.
|
|
|
|
|
|
2010-12-16 15:37:14 +00:00
|
|
|
* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-13
|
|
|
|
|
- Replace tomcat6 BR with servlet25 only
|
|
|
|
|
- Cleanups according to new packaging guidelines
|
|
|
|
|
- Install maven metadata for -api jar
|
|
|
|
|
- Versionless jars/javadocs
|
|
|
|
|
|
2010-11-09 12:31:17 +00:00
|
|
|
* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-12
|
|
|
|
|
- Add depmaps for api and adapters subpackages
|
|
|
|
|
- Use apache-commons-parent BR instead of maven-*
|
|
|
|
|
- Replace tomcat5 BR with tomcat6
|
|
|
|
|
- Reenable tests
|
|
|
|
|
|
2010-07-08 14:00:34 +00:00
|
|
|
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-11
|
|
|
|
|
- Add license to javadoc subpackage
|
|
|
|
|
|
2010-06-09 18:08:45 +00:00
|
|
|
* Wed Jun 9 2010 Alexander Kurtakov <akurtako@redhat.com> 1.1.1-10
|
|
|
|
|
- Add osgi manifest entries.
|
|
|
|
|
|
2010-05-21 12:04:20 +00:00
|
|
|
* Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-9
|
|
|
|
|
- Correct depmap filename for backward compatibility
|
|
|
|
|
|
2010-05-17 14:22:51 +00:00
|
|
|
* Mon May 17 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-8
|
|
|
|
|
- Fix wrong depmap JPP name to short_name
|
2010-05-12 12:21:12 +00:00
|
|
|
- Add obsoletes to javadoc subpackage
|
|
|
|
|
|
2010-05-12 07:37:03 +00:00
|
|
|
* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-7
|
|
|
|
|
- Fix symlink problems introduced previously in r5
|
|
|
|
|
|
2010-05-11 13:28:43 +00:00
|
|
|
* Tue May 11 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-6
|
|
|
|
|
- Add one more add_to_maven_depmap for backward compatibility
|
|
|
|
|
|
2010-05-11 08:52:55 +00:00
|
|
|
* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-5
|
|
|
|
|
- Fix up add_to_maven_depmap
|
|
|
|
|
- Add jpackage-utils Requires for javadoc
|
|
|
|
|
- Cleanup install a bit
|
|
|
|
|
|
2010-05-07 09:29:44 +00:00
|
|
|
* Fri May 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-4
|
|
|
|
|
- Fix provides
|
|
|
|
|
|
2010-05-07 07:10:04 +00:00
|
|
|
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-3
|
|
|
|
|
- Revert to using default permissions
|
|
|
|
|
- Drop "Package" from summary, improve javadoc summary text
|
|
|
|
|
|
|
|
|
|
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-2
|
|
|
|
|
- Fix EOLs on docs
|
|
|
|
|
- Create javadoc symlinks during install
|
|
|
|
|
- Use version macro in Source0 URL, use _mavenpomdir macro
|
|
|
|
|
|
|
|
|
|
* Thu May 6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-1
|
|
|
|
|
- Rename and rebase from jakarta-commons-logging
|
