From 1e01d8859bdbd73a6a38205f7a5459447b7bbeca Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 9 Nov 2010 13:31:17 +0100 Subject: [PATCH 001/108] Add depmaps for api and adapters subpackages - Use apache-commons-parent BR instead of maven-* - Replace tomcat5 BR with tomcat6 - Reenable tests --- apache-commons-logging.spec | 47 ++++++++++++++++++++----------------- commons-logging.depmap | 10 ++++++++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 7ede3cc..5ef9ace 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -18,22 +18,11 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: avalon-framework BuildRequires: avalon-logkit -BuildRequires: maven-doxia-sitetools +BuildRequires: apache-commons-parent 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 +BuildRequires: maven-site-plugin +BuildRequires: tomcat6-servlet-2.5-api +BuildRequires: tomcat6 Requires: java >= 1:1.6.0 Requires: jpackage-utils >= 0:1.6 @@ -83,10 +72,13 @@ 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}" \ + +# fails with recent surefire for some reason +rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java +rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java + +mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.test.skip=true \ install javadoc:javadoc # ----------------------------------------------------------------------------- @@ -113,10 +105,17 @@ 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} -# following line is only for backwards compatibility. New packages +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +%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 # should use proper groupid org.apache.commons and also artifactid %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} - +%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} @@ -154,6 +153,12 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* 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-* +- Replace tomcat5 BR with tomcat6 +- Reenable tests + * Thu Jul 8 2010 Stanislav Ochotnicky - 1.1.1-11 - Add license to javadoc subpackage diff --git a/commons-logging.depmap b/commons-logging.depmap index 480c635..24c689a 100644 --- a/commons-logging.depmap +++ b/commons-logging.depmap @@ -23,4 +23,14 @@ 4.1.4 + + + javax.servlet + servlet-api + + + JPP + tomcat6-servlet-2.5-api + + From 7db8532dbe645a57dd3cb050858b04e119d1d830 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 16 Dec 2010 16:37:14 +0100 Subject: [PATCH 002/108] Replace tomcat6 BR with servlet25 only - Cleanups according to new packaging guidelines - Install maven metadata for -api jar - Versionless jars/javadocs --- apache-commons-logging.spec | 56 ++++++------ commons-logging-api-1.1.pom | 165 ++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 32 deletions(-) create mode 100644 commons-logging-api-1.1.pom 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 +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} - -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} %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 From 81e53d9dff0311b0a7fbe91fa0fd0b70b8333d23 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 16 Dec 2010 23:26:37 +0200 Subject: [PATCH 003/108] Bring back commons-logging* symlinks. --- apache-commons-logging.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index ddd9880..70f1d15 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -87,6 +87,12 @@ install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} 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 +pushd $RPM_BUILD_ROOT%{_javadir} +for jar in %{name}*; do + ln -sf ${jar} `echo $jar| sed "s|apache-||g"` +done +popd + # pom install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom @@ -139,6 +145,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : # ----------------------------------------------------------------------------- %changelog +* Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 +- Bring back commons-logging* symlinks. + * Thu Dec 16 2010 Stanislav Ochotnicky - 1.1.1-13 - Replace tomcat6 BR with servlet25 only - Cleanups according to new packaging guidelines From 24d1fdfe9467946ab3188b6183f591be1a8242f8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:33:42 -0600 Subject: [PATCH 004/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 70f1d15..e126282 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -145,6 +145,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : # ----------------------------------------------------------------------------- %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 - Bring back commons-logging* symlinks. From e6f0c5a53bfd370dbea15ac3e1ceb97a76c8df26 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Thu, 21 Apr 2011 14:07:33 +0200 Subject: [PATCH 005/108] Build with maven 3 - Fix build for avalon-framework --- apache-commons-logging.spec | 30 ++++++++++++------- commons-logging-avalon-update.patch | 29 ++++++++++++++++++ commons-logging.depmap | 46 ++++++++++++++--------------- 3 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 commons-logging-avalon-update.patch diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index e126282..d9c8baa 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -12,15 +12,19 @@ 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 +# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143 +Patch0: %{short_name}-avalon-update.patch + Patch1: %{short_name}-eclipse-manifest.patch -Patch0: %{short_name}-maven-release-plugin.patch BuildArch: noarch +BuildRequires: maven BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: avalon-framework +BuildRequires: avalon-framework >= 4.3 BuildRequires: avalon-logkit BuildRequires: apache-commons-parent BuildRequires: maven-plugin-build-helper +BuildRequires: maven-release-plugin BuildRequires: maven-site-plugin BuildRequires: servlet25 @@ -59,7 +63,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4 %prep %setup -q -n %{short_name}-%{version}-src -%patch0 -p1 -b .rhbug_588142 +%patch0 -p1 %patch1 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt @@ -67,16 +71,16 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt # ----------------------------------------------------------------------------- %build -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - # fails with recent surefire for some reason rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java -mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install javadoc:javadoc +# These files have names suggesting they are test cases but they are not. +# They should probably be renamed/excluded from surefire run properly +rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java + +mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \ + install javadoc:aggregate # ----------------------------------------------------------------------------- @@ -91,7 +95,7 @@ pushd $RPM_BUILD_ROOT%{_javadir} for jar in %{name}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"` done -popd +popd # pom install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} @@ -145,6 +149,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : # ----------------------------------------------------------------------------- %changelog +* Thu Apr 21 2011 Stanislav Ochotnicky - 1.1.1-16 +- Build with maven 3 +- Fix build for avalon-framework + * Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/commons-logging-avalon-update.patch b/commons-logging-avalon-update.patch new file mode 100644 index 0000000..aadaaa7 --- /dev/null +++ b/commons-logging-avalon-update.patch @@ -0,0 +1,29 @@ +diff --git a/pom.xml b/pom.xml +index 8efaf6d..24dc9fb 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -472,8 +472,15 @@ under the License. + + + avalon-framework +- avalon-framework +- 4.1.3 ++ avalon-framework-api ++ 4.3 ++ true ++ ++ ++ avalon-framework ++ avalon-framework-impl ++ 4.3 ++ test + true + + +@@ -520,4 +527,4 @@ under the License. + 1.2 + 1.1 + +- +\ No newline at end of file ++ diff --git a/commons-logging.depmap b/commons-logging.depmap index 24c689a..1059072 100644 --- a/commons-logging.depmap +++ b/commons-logging.depmap @@ -1,28 +1,4 @@ - - - logkit - logkit - 1.0.1 - - - JPP - avalon-logkit - 1.0.8 - - - - - avalon-framework - avalon-framework - 4.1.3 - - - JPP - avalon-framework - 4.1.4 - - javax.servlet @@ -33,4 +9,26 @@ tomcat6-servlet-2.5-api + + + servletapi + servletapi + + + JPP + tomcat6-servlet-2.5-api + + + + + geronimo-spec + geronimo-spec-javamail + + + + + geronimo-spec + geronimo-spec-jms + + From 8474551cd6ddcb2117f94293b9cf7a819fe3ed9f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:36:11 -0600 Subject: [PATCH 006/108] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- apache-commons-logging.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index d9c8baa..4e8b467 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -149,6 +149,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : # ----------------------------------------------------------------------------- %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 1.1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Apr 21 2011 Stanislav Ochotnicky - 1.1.1-16 - Build with maven 3 - Fix build for avalon-framework From 7e7d17b790b3fff02248061592cad66c278dd9b8 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Mon, 30 Apr 2012 17:30:00 +0300 Subject: [PATCH 007/108] Fix build with latest libs. - Adapt to current guidelines. --- apache-commons-logging.spec | 33 +++++----------------- commons-logging-maven-release-plugin.patch | 33 ---------------------- commons-logging.depmap | 28 ++---------------- 3 files changed, 10 insertions(+), 84 deletions(-) delete mode 100644 commons-logging-maven-release-plugin.patch diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 4e8b467..4300cd6 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 1.1.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Apache Commons Logging License: ASL 2.0 Group: Development/Libraries @@ -26,16 +26,10 @@ BuildRequires: apache-commons-parent BuildRequires: maven-plugin-build-helper BuildRequires: maven-release-plugin BuildRequires: maven-site-plugin -BuildRequires: servlet25 +BuildRequires: servlet Requires: java >= 1:1.6.0 Requires: jpackage-utils >= 0:1.6 -Requires(post): jpackage-utils -Requires(postun):jpackage-utils - -# This should go away with F-17 -Provides: jakarta-%{short_name} = 0:%{version}-%{release} -Obsoletes: jakarta-%{short_name} <= 0:1.0.4 %description The commons-logging package provides a simple, component oriented @@ -79,7 +73,7 @@ rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java # They should probably be renamed/excluded from surefire run properly rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java -mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \ +mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" \ install javadoc:aggregate # ----------------------------------------------------------------------------- @@ -117,23 +111,7 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api 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 -%defattr(-,root,root,-) %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt %{_javadir}/* %{_mavenpomdir}/JPP-%{short_name}.pom @@ -142,13 +120,16 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %files javadoc -%defattr(-,root,root,-) %doc LICENSE.txt %{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Mon Apr 30 2012 Alexander Kurtakov 1.1.1-18 +- Fix build with latest libs. +- Adapt to current guidelines. + * Thu Jan 12 2012 Fedora Release Engineering - 1.1.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/commons-logging-maven-release-plugin.patch b/commons-logging-maven-release-plugin.patch deleted file mode 100644 index 835db1f..0000000 --- a/commons-logging-maven-release-plugin.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 8efaf6d..4b3e8f9 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -308,21 +308,6 @@ under the License. - - - -- org.apache.maven.plugins -- maven-release-plugin -- 2.0-beta-6 -- -- -- site deploy -- -- -Prelease -- -- -- -- - +- org.codehaus.mojo +- build-helper-maven-plugin +- 1.0 +- +- +- attach-artifacts +- package +- +- attach-artifact +- +- +- +- +- ${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar +- jar +- adapters +- +- +- ${project.build.directory}/${project.artifactId}-api-${project.version}.jar +- jar +- api +- +- +- +- +- +- +- +- +- -- org.codehaus.mojo -- build-helper-maven-plugin -- 1.0 -- -- -- attach-artifacts -- package -- -- attach-artifact -- -- -- -- -- ${project.build.directory}/${project.artifactId}-adapters-${project.version}.jar -- jar -- adapters -- -- -- ${project.build.directory}/${project.artifactId}-api-${project.version}.jar -- jar -- api -- -- -- -- -- -- -- -- --