Hello community,
here is the log from the commit of package apache-commons-logging for openSUSE:Factory checked in at 2013-09-03 22:01:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2012-04-03 19:52:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes 2013-09-03 22:01:22.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Aug 27 08:51:35 UTC 2013 - mvyskocil@suse.com
+
+- update to 1.1.3 (bugfix release)
+ see http://commons.apache.org/proper/commons-logging/changes-report.html
+ or RELEASE-NOTES.txt for details
+- add gpg verification
+- use new add_maven_depmap from javapackages-tools
+- dropped unecessary patches/sources
+ * build.xml.patch
+ * commons-logging-eclipse-manifest.patch
+ * commons-logging-maven-release-plugin.patch
+ * and commons-logging.depmap
+
+-------------------------------------------------------------------
Old:
----
build.xml.patch
commons-logging-1.1.1-src.tar.gz
commons-logging-eclipse-manifest.patch
commons-logging-maven-release-plugin.patch
commons-logging.depmap
New:
----
apache-commons-logging.keyring
commons-logging-1.1.3-src.tar.gz
commons-logging-1.1.3-src.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-commons-logging.spec ++++++
--- /var/tmp/diff_new_pack.i4Bmrq/_old 2013-09-03 22:01:23.000000000 +0200
+++ /var/tmp/diff_new_pack.i4Bmrq/_new 2013-09-03 22:01:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
@@ -20,32 +20,30 @@
%define base_name logging
%define short_name commons-%{base_name}
-%define with_maven 0
-%define _mavenpomdir %{_datadir}/maven2/poms
Name: apache-%{short_name}
-Version: 1.1.1
+Version: 1.1.3
Release: 0
Summary: Apache Commons Logging
License: Apache-2.0
Group: Development/Libraries/Java
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
-Patch2: build.xml.patch
+Source1: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
+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
+
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils >= 1.6
BuildRequires: junit
-%if %{with_maven}
+%if %with maven
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-site-plugin
%endif
+BuildRequires: gpg-offline
BuildRequires: servletapi5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -70,7 +68,7 @@
the two, and to allow a developer to not tie himself to a particular
logging implementation.
-%if %{with_maven}
+%if %with maven
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
@@ -81,27 +79,26 @@
%description javadoc
API documentation for %{name}.
%endif
-# -----------------------------------------------------------------------------
%prep
+%gpg_verify %{SOURCE1}
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1 -b .rhbug_588142
-%patch1
-%patch2
+
+# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
+%pom_remove_dep :avalon-framework
+%pom_add_dep avalon-framework:avalon-framework-api:4.3
+%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
-# -----------------------------------------------------------------------------
+#FIXME
+rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
%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
-
-%if %{with_maven}
+%if %with maven
mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
@@ -111,9 +108,8 @@
junit \
):target/classes:target/test-classes
ant -Dmaven.mode.offline=true dist \
- -lib /usr/share/java
+ -lib %{_javadir}
%endif
-# -----------------------------------------------------------------------------
%install
# jars
@@ -131,54 +127,37 @@
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom
-install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
+install -pm 644 %{SOURCE3} %{buildroot}/%{_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}-api %{version} JPP %{short_name}-api
-%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
+%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}
+%if %with maven
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-# -----------------------------------------------------------------------------
%endif
-%post
-%update_maven_depmap
-%postun
-%update_maven_depmap
-
-%if %{with_maven}
+%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 STATUS.html LICENSE.txt RELEASE-NOTES.txt
+%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}
+%if %with maven
%files javadoc
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadocdir}/%{name}
%endif
-# -----------------------------------------------------------------------------
-
%changelog
++++++ apache-commons-logging.keyring ++++++
pub 4096R/99945293 2012-01-19
uid Thomas Neidhart