diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 5ef9ace..ddd9880 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,13 +4,14 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 12%{?dist} +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 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 Patch0: %{short_name}-maven-release-plugin.patch BuildArch: noarch @@ -21,16 +22,13 @@ BuildRequires: avalon-logkit BuildRequires: apache-commons-parent BuildRequires: maven-plugin-build-helper BuildRequires: maven-site-plugin -BuildRequires: tomcat6-servlet-2.5-api -BuildRequires: tomcat6 +BuildRequires: servlet25 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 - # This should go away with F-17 Provides: jakarta-%{short_name} = 0:%{version}-%{release} 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 %patch0 -p1 -b .rhbug_588142 - %patch1 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt @@ -84,31 +81,19 @@ mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \ # ----------------------------------------------------------------------------- %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 - -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 +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.jar +install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar # pom install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom -%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} +install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api.pom -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name} %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 # 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}-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} -# ----------------------------------------------------------------------------- -%clean -rm -rf $RPM_BUILD_ROOT +# javadoc +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %post %update_maven_depmap - %postun %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 @@ -141,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt %{_javadir}/* %{_mavenpomdir}/JPP-%{short_name}.pom +%{_mavenpomdir}/JPP-%{short_name}-api.pom %{_mavendepmapfragdir}/* @@ -148,11 +135,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc LICENSE.txt %{_javadocdir}/%{name} -%{_javadocdir}/%{name}-%{version} # ----------------------------------------------------------------------------- %changelog +* Thu Dec 16 2010 Stanislav Ochotnicky - 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 - 1.1.1-12 - Add depmaps for api and adapters subpackages - Use apache-commons-parent BR instead of maven-* diff --git a/commons-logging-api-1.1.pom b/commons-logging-api-1.1.pom new file mode 100644 index 0000000..c8b5be8 --- /dev/null +++ b/commons-logging-api-1.1.pom @@ -0,0 +1,165 @@ + + 4.0.0 + commons-logging + commons-logging-api + Logging + 1.1 + Commons Logging is a thin adapter allowing configurable bridging to other, + well known logging systems. + http://jakarta.apache.org/commons/logging/ + + http://issues.apache.org/jira/browse/LOGGING + + + + + +
commons-dev@jakarta.apache.org
+ + + + + 2001 + + + Commons Dev List + commons-dev-subscribe@jakarta.apache.org + commons-dev-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/ + + + Commons User List + commons-user-subscribe@jakarta.apache.org + commons-user-unsubscribe@jakarta.apache.org + http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/ + + + + + morgand + Morgan Delagrange + morgand at apache dot org + Apache + + Java Developer + + + + rwaldhoff + Rodney Waldhoff + rwaldhoff at apache org + Apache Software Foundation + + + craigmcc + Craig McClanahan + craigmcc at apache org + Apache Software Foundation + + + sanders + Scott Sanders + sanders at apache dot org + Apache Software Foundation + + + rdonkin + Robert Burrell Donkin + rdonkin at apache dot org + Apache Software Foundation + + + donaldp + Peter Donald + donaldp at apache dot org + + + + costin + Costin Manolache + costin at apache dot org + Apache Software Foundation + + + rsitze + Richard Sitze + rsitze at apache dot org + Apache Software Foundation + + + baliuka + Juozas Baliuka + baliuka@apache.org + + + Java Developer + + + + skitching + Simon Kitching + skitching@apache.org + Apache Software Foundation + + + dennisl + Dennis Lundberg + dennisl@apache.org + Apache Software Foundation + + + bstansberry + Brian Stansberry + + + + + The Apache Software License, Version 2.0 + /LICENSE.txt + + + + scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/ + http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/ + + + The Apache Software Foundation + http://jakarta.apache.org + + + src/java + src/test + + + maven-xdoc-plugin + 1.9.2 + + true + <strong>Site Only</strong> - v1.9.2 (minimum) + + + + + + + junit + junit + 3.8.1 + test + true + + + + + default + Default Repository + file:///www/jakarta.apache.org/builds/jakarta-commons/logging/ + + + default + Default Site + scp://people.apache.org//www/jakarta.apache.org/commons/logging/ + + converted + + \ No newline at end of file