rpms/apache-commons-logging
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Replace tomcat6 BR with servlet25 only

Browse Source 
- Cleanups according to new packaging guidelines
- Install maven metadata for -api jar
- Versionless jars/javadocs
This commit is contained in:
Stanislav Ochotnicky 2010-12-16 16:37:14 +01:00
parent 1e01d8859b
commit 7db8532dbe
2 changed files with 189 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apache-commons-logging.spec
View File

@ -4,13 +4,14 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.1.1 Version: 1.1.1
Release: 12%{?dist} Release: 13%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
Group: Development/Libraries Group: Development/Libraries
URL: http://commons.apache.org/%{base_name} URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: %{short_name}.depmap Source1: %{short_name}.depmap
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
Patch1: %{short_name}-eclipse-manifest.patch Patch1: %{short_name}-eclipse-manifest.patch
Patch0: %{short_name}-maven-release-plugin.patch Patch0: %{short_name}-maven-release-plugin.patch
BuildArch: noarch BuildArch: noarch
@ -21,16 +22,13 @@ BuildRequires: avalon-logkit
BuildRequires: apache-commons-parent BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-build-helper BuildRequires: maven-plugin-build-helper
BuildRequires: maven-site-plugin BuildRequires: maven-site-plugin
BuildRequires: tomcat6-servlet-2.5-api BuildRequires: servlet25
BuildRequires: tomcat6
Requires: java >= 1:1.6.0 Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6 Requires: jpackage-utils >= 0:1.6
Requires(post): jpackage-utils Requires(post): jpackage-utils
Requires(postun):jpackage-utils Requires(postun):jpackage-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
# This should go away with F-17 # This should go away with F-17
Provides: jakarta-%{short_name} = 0:%{version}-%{release} Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} <= 0:1.0.4 Obsoletes: jakarta-%{short_name} <= 0:1.0.4
@ -62,7 +60,6 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
%setup -q -n %{short_name}-%{version}-src %setup -q -n %{short_name}-%{version}-src
%patch0 -p1 -b .rhbug_588142 %patch0 -p1 -b .rhbug_588142
%patch1 %patch1
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
@ -84,31 +81,19 @@ mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%install %install
rm -rf $RPM_BUILD_ROOT
# jars # jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} 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}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.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}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar
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"`
ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
done
popd # come back from javadir
# pom # pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} %add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api %add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters %add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters
# following lines are only for backwards compatibility. New packages # following lines are only for backwards compatibility. New packages
@ -117,23 +102,24 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api %add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api
%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters %add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters
# 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}
# ----------------------------------------------------------------------------- # javadoc
%clean install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf $RPM_BUILD_ROOT cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%post %post
%update_maven_depmap %update_maven_depmap
%postun %postun
%update_maven_depmap %update_maven_depmap
%pre javadoc
# workaround for rpm bug, can be removed in F-17
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%files %files
@ -141,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
%{_javadir}/* %{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom %{_mavenpomdir}/JPP-%{short_name}.pom
%{_mavenpomdir}/JPP-%{short_name}-api.pom
%{_mavendepmapfragdir}/* %{_mavendepmapfragdir}/*
@ -148,11 +135,16 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE.txt %doc LICENSE.txt
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%{_javadocdir}/%{name}-%{version}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* 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
* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-12 * Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-12
- Add depmaps for api and adapters subpackages - Add depmaps for api and adapters subpackages
- Use apache-commons-parent BR instead of maven-* - Use apache-commons-parent BR instead of maven-*

165
commons-logging-api-1.1.pom Normal file
View File

@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<name>Logging</name>
<version>1.1</version>
<description>Commons Logging is a thin adapter allowing configurable bridging to other,
well known logging systems.</description>
<url>http://jakarta.apache.org/commons/logging/</url>
<issueManagement>
<url>http://issues.apache.org/jira/browse/LOGGING</url>
</issueManagement>
<ciManagement>
<notifiers>
<notifier>
<configuration>
<address>commons-dev@jakarta.apache.org</address>
</configuration>
</notifier>
</notifiers>
</ciManagement>
<inceptionYear>2001</inceptionYear>
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
<subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
</mailingList>
<mailingList>
<name>Commons User List</name>
<subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
<unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<id>morgand</id>
<name>Morgan Delagrange</name>
<email>morgand at apache dot org</email>
<organization>Apache</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>rwaldhoff</id>
<name>Rodney Waldhoff</name>
<email>rwaldhoff at apache org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>craigmcc</id>
<name>Craig McClanahan</name>
<email>craigmcc at apache org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>sanders</id>
<name>Scott Sanders</name>
<email>sanders at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>rdonkin</id>
<name>Robert Burrell Donkin</name>
<email>rdonkin at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>donaldp</id>
<name>Peter Donald</name>
<email>donaldp at apache dot org</email>
<organization></organization>
</developer>
<developer>
<id>costin</id>
<name>Costin Manolache</name>
<email>costin at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>rsitze</id>
<name>Richard Sitze</name>
<email>rsitze at apache dot org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>baliuka</id>
<name>Juozas Baliuka</name>
<email>baliuka@apache.org</email>
<organization></organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>skitching</id>
<name>Simon Kitching</name>
<email>skitching@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>dennisl</id>
<name>Dennis Lundberg</name>
<email>dennisl@apache.org</email>
<organization>Apache Software Foundation</organization>
</developer>
<developer>
<id>bstansberry</id>
<name>Brian Stansberry</name>
</developer>
</developers>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>/LICENSE.txt</url>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</connection>
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://jakarta.apache.org</url>
</organization>
<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-xdoc-plugin</artifactId>
<version>1.9.2</version>
<configuration>
<optional>true</optional>
<comment>&lt;strong>Site Only&lt;/strong> - v1.9.2 (minimum)</comment>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>default</id>
<name>Default Repository</name>
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
</repository>
<site>
<id>default</id>
<name>Default Site</name>
<url>scp://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
</site>
<status>converted</status>
</distributionManagement>
</project>