From dd13b7860dd3ba0cf1cfe9de1a93600ab815c1aebc4f71fcba44c714e5a03980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 18 Mar 2015 10:05:58 +0000 Subject: [PATCH 1/2] new jpackage-tools OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=21 --- apache-commons-logging.changes | 5 +++++ apache-commons-logging.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 7433e2f..8cb0049 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 18 09:46:00 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + ------------------------------------------------------------------- Wed Mar 4 10:31:13 UTC 2015 - tchvatal@suse.com diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 586d8dd..5885aa5 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -158,7 +158,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/* %{_mavenpomdir}/JPP-%{short_name}.pom %{_mavenpomdir}/JPP-%{short_name}-api.pom -%config %{_mavendepmapfragdir}/* +%{_datadir}/maven-metadata/%{name}.xml* %if %with maven %files javadoc From 481eaa01454318b7fecacc5689f36c1a3d1896a32e58f37ee83f97913c537af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Mar 2015 09:20:33 +0000 Subject: [PATCH 2/2] - Drop maven conditionals that were never triggered. - Drop gpg offline and rely on service OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=22 --- apache-commons-logging.changes | 10 ++++++ apache-commons-logging.spec | 61 ++++------------------------------ 2 files changed, 16 insertions(+), 55 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index 8cb0049..f03f6b3 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 25 09:20:20 UTC 2015 - tchvatal@suse.com + +- Drop maven conditionals that were never triggered. + +------------------------------------------------------------------- +Wed Mar 25 09:16:56 UTC 2015 - tchvatal@suse.com + +- Drop gpg offline and rely on service + ------------------------------------------------------------------- Wed Mar 18 09:46:00 UTC 2015 - tchvatal@suse.com diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 5885aa5..31d8a71 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -3,7 +3,6 @@ # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2007, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +20,6 @@ %define base_name logging %define short_name commons-%{base_name} %bcond_with java_bootstrap - Name: apache-%{short_name} Version: 1.1.3 Release: 0 @@ -34,34 +32,26 @@ Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n Source2: apache-commons-logging.keyring Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom Patch0: commons-logging-1.1.3-src-junit.diff - BuildRequires: ant -%if !%{with java_bootstrap} -BuildRequires: ant-junit -%endif BuildRequires: apache-commons-parent BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-tools BuildRequires: junit -%if %with maven -BuildRequires: maven-plugin-build-helper -BuildRequires: maven-site-plugin -%endif -BuildRequires: gpg-offline BuildRequires: log4j-mini >= 1.2 BuildRequires: servletapi5 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - Requires: java >= 1.6.0 Requires: javapackages-tools Requires(post): javapackages-tools -Requires(postun):javapackages-tools - +Requires(postun): javapackages-tools Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version} Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%if !%{with java_bootstrap} +BuildRequires: ant-junit +%endif %description The commons-logging package provides a simple, component oriented @@ -74,20 +64,7 @@ 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. -%if %with maven -%package javadoc -Summary: API documentation for %{name} -Group: Documentation -Requires: javapackages-tools -Provides: jakarta-%{short_name}-javadoc = %{version} -Obsoletes: jakarta-%{short_name}-javadoc < %{version} - -%description javadoc -API documentation for %{name}. -%endif - %prep -%gpg_verify %{SOURCE1} %setup -q -n %{short_name}-%{version}-src %patch0 -p1 @@ -105,18 +82,12 @@ rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL -%if %with maven -mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - install javadoc:javadoc -%else export CLASSPATH=$(build-classpath \ plexus/ \ junit \ ):target/classes:target/test-classes ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \ -lib %{_javadir} -%endif %install # jars @@ -139,19 +110,6 @@ install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po %add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging" %add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api" -%if %with maven -# javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} -%endif - -%if %with maven -%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} || : -%endif - %files %defattr(0644,root,root,0755) %doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt @@ -160,11 +118,4 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_mavenpomdir}/JPP-%{short_name}-api.pom %{_datadir}/maven-metadata/%{name}.xml* -%if %with maven -%files javadoc -%defattr(0644,root,root,0755) -%doc LICENSE.txt -%{_javadocdir}/%{name} -%endif - %changelog