2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
%global base_name logging
|
|
|
|
%global short_name commons-%{base_name}
|
|
|
|
|
|
|
|
Name: apache-%{short_name}
|
|
|
|
Version: 1.1.1
|
2010-05-12 12:21:12 +00:00
|
|
|
Release: 8%{?dist}
|
2010-05-07 07:10:04 +00:00
|
|
|
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
|
|
|
|
Source1: %{short_name}.depmap
|
|
|
|
Patch0: %{short_name}-maven-release-plugin.patch
|
|
|
|
BuildArch: noarch
|
|
|
|
BuildRequires: java-devel >= 1:1.6.0
|
|
|
|
BuildRequires: jpackage-utils >= 0:1.6
|
|
|
|
BuildRequires: avalon-framework
|
|
|
|
BuildRequires: avalon-logkit
|
|
|
|
BuildRequires: maven-doxia-sitetools
|
|
|
|
BuildRequires: maven-plugin-build-helper
|
|
|
|
BuildRequires: maven-plugin-bundle
|
|
|
|
BuildRequires: maven-surefire-maven-plugin
|
|
|
|
BuildRequires: maven2-plugin-antrun
|
|
|
|
BuildRequires: maven2-plugin-assembly
|
|
|
|
BuildRequires: maven2-plugin-compiler
|
|
|
|
BuildRequires: maven2-plugin-install
|
|
|
|
BuildRequires: maven2-plugin-idea
|
|
|
|
BuildRequires: maven2-plugin-jar
|
|
|
|
BuildRequires: maven2-plugin-javadoc
|
|
|
|
BuildRequires: maven2-plugin-resources
|
|
|
|
BuildRequires: maven2-plugin-site
|
|
|
|
|
|
|
|
# this will go away after we update maven to use tomcat6
|
|
|
|
BuildRequires: tomcat5
|
|
|
|
|
|
|
|
Requires: java >= 1:1.6.0
|
|
|
|
Requires: jpackage-utils >= 0:1.6
|
|
|
|
Requires(post): jpackage-utils
|
|
|
|
Requires(postun):jpackage-utils
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
|
|
|
|
2010-05-11 08:52:55 +00:00
|
|
|
# This should go away with F-17
|
2010-05-12 12:21:12 +00:00
|
|
|
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
|
|
|
|
Obsoletes: jakarta-%{short_name} <= 0:1.0.4
|
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}
|
|
|
|
Group: Documentation
|
2010-05-11 08:52:55 +00:00
|
|
|
Requires: jpackage-utils
|
|
|
|
|
2010-05-12 12:21:12 +00:00
|
|
|
Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
%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
|
|
|
|
|
|
|
|
%patch0 -p1 -b .rhbug_588142
|
|
|
|
|
|
|
|
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
%build
|
|
|
|
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
|
|
|
mkdir -p $MAVEN_REPO_LOCAL
|
|
|
|
# TODO remove test.skip=true once maven is updated
|
|
|
|
mvn-jpp -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
|
|
|
|
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
|
|
|
-Dmaven.test.skip=true \
|
|
|
|
install javadoc:javadoc
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
%install
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
# jars
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
|
|
|
install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
|
|
|
|
install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
|
|
|
|
install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar
|
|
|
|
|
2010-05-11 08:52:55 +00:00
|
|
|
pushd $RPM_BUILD_ROOT%{_javadir}
|
|
|
|
for jar in *-%{version}*; do
|
|
|
|
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
|
|
|
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
|
2010-05-12 07:37:03 +00:00
|
|
|
ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
|
2010-05-11 08:52:55 +00:00
|
|
|
done
|
|
|
|
popd # come back from javadir
|
|
|
|
|
|
|
|
# pom
|
2010-05-07 07:10:04 +00:00
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
|
|
|
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
|
2010-05-17 14:22:51 +00:00
|
|
|
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
|
2010-05-07 07:10:04 +00:00
|
|
|
|
2010-05-11 13:28:43 +00:00
|
|
|
# following line is only for backwards compatibility. New packages
|
|
|
|
# should use proper groupid org.apache.commons and also artifactid
|
|
|
|
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
|
|
|
|
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
# javadoc
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|
|
|
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|
|
|
ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
%clean
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
%post
|
|
|
|
%update_maven_depmap
|
|
|
|
|
|
|
|
|
|
|
|
%postun
|
|
|
|
%update_maven_depmap
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
%files
|
|
|
|
%defattr(-,root,root,-)
|
|
|
|
%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
|
|
|
|
%{_javadir}/*
|
|
|
|
%{_mavenpomdir}/JPP-%{short_name}.pom
|
|
|
|
%{_mavendepmapfragdir}/*
|
|
|
|
|
|
|
|
|
|
|
|
%files javadoc
|
|
|
|
%defattr(-,root,root,-)
|
2010-05-11 08:52:55 +00:00
|
|
|
%{_javadocdir}/%{name}
|
|
|
|
%{_javadocdir}/%{name}-%{version}
|
2010-05-07 07:10:04 +00:00
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
|
|
|
%changelog
|
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
|
|
|
|
|