Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2015-04-02 16:00:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-logging"
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2015-03-05 18:15:07.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2015-04-02 16:00:21.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Mar 25 09:20:20 UTC 2015 - [email protected]
+
+- Drop maven conditionals that were never triggered.
+
+-------------------------------------------------------------------
+Wed Mar 25 09:16:56 UTC 2015 - [email protected]
+
+- Drop gpg offline and rely on service
+
+-------------------------------------------------------------------
+Wed Mar 18 09:46:00 UTC 2015 - [email protected]
+
+- Fix build with new javapackages-tools
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-logging.spec ++++++
--- /var/tmp/diff_new_pack.G5Scou/_old 2015-04-02 16:00:21.000000000 +0200
+++ /var/tmp/diff_new_pack.G5Scou/_new 2015-04-02 16:00:21.000000000 +0200
@@ -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 @@
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 @@
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 @@
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,32 +110,12 @@
%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
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
%{_mavenpomdir}/JPP-%{short_name}-api.pom
-%config %{_mavendepmapfragdir}/*
-
-%if %with maven
-%files javadoc
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
-%endif
+%{_datadir}/maven-metadata/%{name}.xml*
%changelog
