commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2019-10-03 16:15:23
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new.2352 (New)
Package is "apache-commons-logging"
Thu Oct 3 16:15:23 2019 rev:21 rq:734254 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2019-03-28 22:45:27.739086123 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new.2352/apache-commons-logging.changes
2019-10-03 16:15:24.668892446 +0200
@@ -1,0 +2,5 @@
+Tue Oct 1 08:45:20 UTC 2019 - Fridrich Strba
+
+- Build against the new compatibility log4j12-mini package
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.oXK2p2/_old 2019-10-03 16:15:25.132891263 +0200
+++ /var/tmp/diff_new_pack.oXK2p2/_new 2019-10-03 16:15:25.136891253 +0200
@@ -24,7 +24,6 @@
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:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
@@ -39,7 +38,7 @@
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: junit
-BuildRequires: log4j-mini >= 1.2
+BuildRequires: log4j12-mini >= 1.2
Requires: java >= 1.8
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
@@ -81,7 +80,7 @@
):target/classes:target/test-classes
ant \
-Dmaven.mode.offline=true -lib %{_javadir} \
- -Dlog4j12.jar=%{_javadir}/log4j.jar
-Dservletapi.jar=%{_javadir}/glassfish-servlet-api.jar \
+ -Dlog4j12.jar=%{_javadir}/log4j12/log4j-12.jar
-Dservletapi.jar=%{_javadir}/glassfish-servlet-api.jar \
dist
%install
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2019-03-28 22:45:24
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new.25356 (New)
Package is "apache-commons-logging"
Thu Mar 28 22:45:24 2019 rev:20 rq:689052 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2019-02-06 15:47:56.159240353 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new.25356/apache-commons-logging.changes
2019-03-28 22:45:27.739086123 +0100
@@ -1,0 +2,8 @@
+Mon Mar 25 17:45:27 UTC 2019 - Fridrich Strba
+
+- Remove pom parent, since we don't use it when not building with
+ maven
+- Use the pom.xml distributed with the package instead of
+ downloading the same file as a separate source
+
+---
Old:
commons-logging-1.2.pom
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.XFgkzw/_old 2019-03-28 22:45:28.327086034 +0100
+++ /var/tmp/diff_new_pack.XFgkzw/_new 2019-03-28 22:45:28.331086034 +0100
@@ -29,21 +29,18 @@
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source2:apache-commons-logging.keyring
-Source3:
http://central.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
Source4:
http://central.maven.org/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
Patch0: commons-logging-1.1.3-src-junit.diff
Patch1: commons-logging-1.2-sourcetarget.patch
Patch2: commons-logging-manifests.patch
BuildRequires: ant
BuildRequires: ant-junit
-BuildRequires: apache-commons-parent
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: log4j-mini >= 1.2
Requires: java >= 1.8
-Requires: mvn(org.apache.commons:commons-parent:pom:)
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}-%{release}
@@ -72,6 +69,8 @@
#FIXME
rm ./src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
+%pom_remove_parent .
+
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
@@ -100,7 +99,7 @@
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE3}
%{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
+install -pm 644 pom.xml
%{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
sed 's#1.1#1.2#g' < %{SOURCE4} > tmp.pom
install -pm 644 tmp.pom
%{buildroot}/%{_mavenpomdir}/%{short_name}-api-%{version}.pom
sed -e 's#1.1#1.2#g' -e
"s#%{short_name}-api#%{short_name}-adapters#g" < %{SOURCE4} > tmp.pom
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2019-02-06 15:47:54
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new.28833 (New)
Package is "apache-commons-logging"
Wed Feb 6 15:47:54 2019 rev:19 rq:672040 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2018-11-01 14:37:05.378921156 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new.28833/apache-commons-logging.changes
2019-02-06 15:47:56.159240353 +0100
@@ -1,0 +2,12 @@
+Wed Feb 6 06:47:05 UTC 2019 - Fridrich Strba
+
+- Build against glassfish-servlet-api
+
+---
+Mon Jan 28 12:43:50 UTC 2019 - Fridrich Strba
+
+- Added patch:
+ * commons-logging-manifests.patch
++ Different Bundle-SymbolicName for different jars
+
+---
New:
commons-logging-manifests.patch
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.W70q0h/_old 2019-02-06 15:47:56.911239899 +0100
+++ /var/tmp/diff_new_pack.W70q0h/_new 2019-02-06 15:47:56.915239896 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -25,7 +25,7 @@
Summary:Apache Commons Logging
License:Apache-2.0
Group: Development/Libraries/Java
-Url:http://commons.apache.org/%{base_name}
+URL:http://commons.apache.org/%{base_name}
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source2:apache-commons-logging.keyring
@@ -33,16 +33,17 @@
Source4:
http://central.maven.org/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
Patch0: commons-logging-1.1.3-src-junit.diff
Patch1: commons-logging-1.2-sourcetarget.patch
+Patch2: commons-logging-manifests.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
+BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini >= 1.2
-BuildRequires: servletapi5
Requires: java >= 1.8
+Requires: mvn(org.apache.commons:commons-parent:pom:)
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}-%{release}
@@ -64,6 +65,7 @@
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
@@ -78,8 +80,10 @@
plexus/ \
junit \
):target/classes:target/test-classes
-ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \
--lib %{_javadir}
+ant \
+ -Dmaven.mode.offline=true -lib %{_javadir} \
+ -Dlog4j12.jar=%{_javadir}/log4j.jar
-Dservletapi.jar=%{_javadir}/glassfish-servlet-api.jar \
+ dist
%install
# jars
@@ -105,15 +109,9 @@
%add_maven_depmap %{short_name}-api-%{version}.pom %{short_name}-api.jar -a
"org.apache.commons:%{short_name}-api","apache:%{short_name}-api"
%add_maven_depmap %{short_name}-adapters-%{version}.pom
%{short_name}-adapters.jar -a
"org.apache.commons:%{short_name}-adapters","apache:%{short_name}-adapters"
-%files
-%defattr(0644,root,root,0755)
-%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
+%files -f .mfiles
+%{_javadir}/%{name}*.jar
+%license LICENSE.txt
+%doc PROPOSAL.html RELEASE-NOTES.txt NOTICE.txt
%changelog
++ commons-logging-manifests.patch ++
--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.0 +0200
+++ commons-logging-1.2-src/build.xml 2019-01-28 13:41:46.362796232 +0100
@@ -263,9 +263,31 @@
description="Copy static files to build directory">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2018-11-01 14:37:00
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
Package is "apache-commons-logging"
Thu Nov 1 14:37:00 2018 rev:18 rq:645282 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2018-07-24 17:30:42.503934884 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2018-11-01 14:37:05.378921156 +0100
@@ -1,0 +2,5 @@
+Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba
+
+- Cleanup of maven pom files installation
+
+---
New:
commons-logging-api-1.1.pom
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.ygaZ3g/_old 2018-11-01 14:37:07.534920944 +0100
+++ /var/tmp/diff_new_pack.ygaZ3g/_new 2018-11-01 14:37:07.534920944 +0100
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -29,7 +29,8 @@
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source2:apache-commons-logging.keyring
-Source3:
http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
+Source3:
http://central.maven.org/maven2/%{short_name}/%{short_name}/%{version}/%{short_name}-%{version}.pom
+Source4:
http://central.maven.org/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
Patch0: commons-logging-1.1.3-src-junit.diff
Patch1: commons-logging-1.2-sourcetarget.patch
BuildRequires: ant
@@ -64,11 +65,6 @@
%patch0 -p1
%patch1 -p1
-# 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
@@ -100,18 +96,24 @@
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom
-install -pm 644 %{SOURCE3}
%{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
-
-%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"
+install -pm 644 %{SOURCE3}
%{buildroot}/%{_mavenpomdir}/%{short_name}-%{version}.pom
+sed 's#1.1#1.2#g' < %{SOURCE4} > tmp.pom
+install -pm 644 tmp.pom
%{buildroot}/%{_mavenpomdir}/%{short_name}-api-%{version}.pom
+sed -e 's#1.1#1.2#g' -e
"s#%{short_name}-api#%{short_name}-adapters#g" < %{SOURCE4} > tmp.pom
+install -pm 644 tmp.pom
%{buildroot}/%{_mavenpomdir}/%{short_name}-adapters-%{version}.pom
+%add_maven_depmap %{short_name}-%{version}.pom %{short_name}.jar -a
"org.apache.commons:%{short_name}","apache:%{short_name}"
+%add_maven_depmap %{short_name}-api-%{version}.pom %{short_name}-api.jar -a
"org.apache.commons:%{short_name}-api","apache:%{short_name}-api"
+%add_maven_depmap %{short_name}-adapters-%{version}.pom
%{short_name}-adapters.jar -a
"org.apache.commons:%{short_name}-adapters","apache:%{short_name}-adapters"
%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
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
%{_datadir}/maven-metadata/%{name}.xml*
+%endif
%changelog
++ commons-logging-api-1.1.pom ++
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-...@jakarta.apache.org
2001
Commons Dev List
commons-dev-subscr...@jakarta.apache.org
commons-dev-unsubscr...@jakarta.apache.org
http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/
Commons User List
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2018-07-24 17:30:38
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
Package is "apache-commons-logging"
Tue Jul 24 17:30:38 2018 rev:17 rq:620753 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2017-09-13 22:19:12.117648590 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2018-07-24 17:30:42.503934884 +0200
@@ -1,0 +2,8 @@
+Tue May 15 10:56:40 UTC 2018 - fst...@suse.com
+
+- Modified patch:
+ * commons-logging-1.2-sourcetarget.patch
++ Build with source and target 8 to prepare for a possible
+ removal of 1.6 compatibility
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.eApVYB/_old 2018-07-24 17:30:43.447936077 +0200
+++ /var/tmp/diff_new_pack.eApVYB/_new 2018-07-24 17:30:43.447936077 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -35,13 +35,13 @@
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
-BuildRequires: java-devel >= 1.6.0
+BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini >= 1.2
BuildRequires: servletapi5
-Requires: java >= 1.6.0
+Requires: java >= 1.8
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}
Provides: %{short_name} = %{version}-%{release}
++ commons-logging-1.2-sourcetarget.patch ++
--- /var/tmp/diff_new_pack.eApVYB/_old 2018-07-24 17:30:43.483936122 +0200
+++ /var/tmp/diff_new_pack.eApVYB/_new 2018-07-24 17:30:43.483936122 +0200
@@ -5,11 +5,11 @@
-
-+
++
-
-+
++
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2017-09-13 22:19:10
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
Package is "apache-commons-logging"
Wed Sep 13 22:19:10 2017 rev:16 rq:521994 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2017-05-31 13:29:15.844404253 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2017-09-13 22:19:12.117648590 +0200
@@ -1,0 +2,8 @@
+Thu Sep 7 12:07:36 UTC 2017 - fst...@suse.com
+
+- Added patch:
+ * commons-logging-1.2-sourcetarget.patch
+- set java source and target versions to 1.6 in order to allow
+ build with jdk9
+
+---
New:
commons-logging-1.2-sourcetarget.patch
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.0JZzFT/_old 2017-09-13 22:19:12.689568073 +0200
+++ /var/tmp/diff_new_pack.0JZzFT/_new 2017-09-13 22:19:12.693567510 +0200
@@ -31,6 +31,7 @@
Source2:apache-commons-logging.keyring
Source3:
http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
Patch0: commons-logging-1.1.3-src-junit.diff
+Patch1: commons-logging-1.2-sourcetarget.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
@@ -61,6 +62,7 @@
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
+%patch1 -p1
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%pom_remove_dep :avalon-framework
++ commons-logging-1.2-sourcetarget.patch ++
--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.0 +0200
+++ commons-logging-1.2-src/build.xml 2017-09-07 14:05:10.680439161 +0200
@@ -130,10 +130,10 @@
-
+
-
+
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2017-05-31 13:29:14
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
Package is "apache-commons-logging"
Wed May 31 13:29:14 2017 rev:15 rq:496607 version:1.2
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2016-01-30 11:30:48.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2017-05-31 13:29:15.844404253 +0200
@@ -1,0 +2,11 @@
+Fri May 19 11:03:15 UTC 2017 - tchva...@suse.com
+
+- Remove bootstrap conditional
+
+---
+Fri May 19 10:51:10 UTC 2017 - pcervi...@suse.com
+
+- New build dependency: javapackages-local
+- Fixed requires
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.Z3YDO2/_old 2017-05-31 13:29:16.460317439 +0200
+++ /var/tmp/diff_new_pack.Z3YDO2/_new 2017-05-31 13:29:16.464316876 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,6 @@
%define base_name logging
%define short_name commons-%{base_name}
-%bcond_with java_bootstrap
Name: apache-%{short_name}
Version:1.2
Release:0
@@ -33,25 +32,20 @@
Source3:
http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
Patch0: commons-logging-1.1.3-src-junit.diff
BuildRequires: ant
+BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: java-devel >= 1.6.0
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini >= 1.2
BuildRequires: servletapi5
Requires: java >= 1.6.0
-Requires: javapackages-tools
-Requires(post): 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
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2016-01-30 11:30:47
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-04-02 16:00:21.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2016-01-30 11:30:48.0 +0100
@@ -1,0 +2,7 @@
+Sun Jan 24 13:55:36 UTC 2016 - p.drou...@gmail.com
+
+- Update to version 1.2
+ see http://commons.apache.org/proper/commons-logging/changes-report.html
+ or RELEASE-NOTES.txt for details
+
+---
Old:
commons-logging-1.1.3-src.tar.gz
commons-logging-1.1.3-src.tar.gz.asc
commons-logging-api-1.1.pom
New:
commons-logging-1.2-src.tar.gz
commons-logging-1.2-src.tar.gz.asc
commons-logging-1.2.pom
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.qDxKgr/_old 2016-01-30 11:30:49.0 +0100
+++ /var/tmp/diff_new_pack.qDxKgr/_new 2016-01-30 11:30:49.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -21,7 +21,7 @@
%define short_name commons-%{base_name}
%bcond_with java_bootstrap
Name: apache-%{short_name}
-Version:1.1.3
+Version:1.2
Release:0
Summary:Apache Commons Logging
License:Apache-2.0
@@ -30,7 +30,7 @@
Source0:
http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
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
+Source3:
http://central.maven.org/maven2/commons-logging/commons-logging/%{version}/%{short_name}-%{version}.pom
Patch0: commons-logging-1.1.3-src-junit.diff
BuildRequires: ant
BuildRequires: apache-commons-parent
++ commons-logging-1.1.3-src.tar.gz -> commons-logging-1.2-src.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/commons-logging-1.1.3-src/NOTICE.txt
new/commons-logging-1.2-src/NOTICE.txt
--- old/commons-logging-1.1.3-src/NOTICE.txt2013-05-16 22:04:22.0
+0200
+++ new/commons-logging-1.2-src/NOTICE.txt 2014-07-05 20:11:36.0
+0200
@@ -1,5 +1,5 @@
Apache Commons Logging
-Copyright 2003-2013 The Apache Software Foundation
+Copyright 2003-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/commons-logging-1.1.3-src/README.txt
new/commons-logging-1.2-src/README.txt
--- old/commons-logging-1.1.3-src/README.txt1970-01-01 01:00:00.0
+0100
+++ new/commons-logging-1.2-src/README.txt 2014-07-05 20:11:36.0
+0200
@@ -0,0 +1,50 @@
+
+
+Logging
+---
+
+Getting started:
+
+1) Build the jar file
+
+ If you have the source distribution you will need to build the jar file
+ using Maven 2/3. For instructions on downloading and installing Maven see
+ http://maven.apache.org/.
+
+ To build execute the command 'mvn package verify'.
+ The jar file will be built in the target directory.
+
+ Note: the unit tests are executed during the verify phase and require that
+ the respective jar files have been created successfully.
+
+2) Generate the documentation
+
+ Run the 'mvn verify site' command. The documentation will be written
+ to the target/site directory. The documentation has some examples of
+ how to use this package as well as a troubleshooting guide.
+
+3) Create source and binary distributions
+
+ Run the 'mvn verify site assembly:assembly' command. The source and binary
+ distributions are created in the 'target' directory.
+
+4) Use
+
+ Simply include the jar file built in step #1 in your classpath. Import the
+ classes that you want to use and you are ready to go!
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
commit apache-commons-logging for openSUSE:Factory
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.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2015-04-02 16:00:21.0 +0200
@@ -1,0 +2,15 @@
+Wed Mar 25 09:20:20 UTC 2015 - tchva...@suse.com
+
+- Drop maven conditionals that were never triggered.
+
+---
+Wed Mar 25 09:16:56 UTC 2015 - tchva...@suse.com
+
+- Drop gpg offline and rely on service
+
+---
+Wed Mar 18 09:46:00 UTC 2015 - tchva...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.G5Scou/_new 2015-04-02 16:00:21.0 +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
-%packagejavadoc
-Summary:API documentation for %{name}
-Group: Documentation
-Requires: javapackages-tools
-Provides: jakarta-%{short_name}-javadoc = %{version}
-Obsoletes: jakarta-%{short_name}-javadoc %{version}
-
-%descriptionjavadoc
-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
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2015-03-05 15:33:24
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
2014-08-14 14:57:42.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2015-03-05 18:15:07.0 +0100
@@ -1,0 +2,11 @@
+Wed Mar 4 10:31:13 UTC 2015 - tchva...@suse.com
+
+- Use log4j-mini to hopefully avoid build-cycle
+
+---
+Fri Feb 20 15:14:30 UTC 2015 - dmacvi...@suse.de
+
+- add the log4j adapter to commons-logging-adapters
+ (bnc#918852)
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.C7Y9x5/_old 2015-03-05 18:15:08.0 +0100
+++ /var/tmp/diff_new_pack.C7Y9x5/_new 2015-03-05 18:15:08.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
@@ -48,6 +48,7 @@
BuildRequires: maven-site-plugin
%endif
BuildRequires: gpg-offline
+BuildRequires: log4j-mini = 1.2
BuildRequires: servletapi5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -113,7 +114,7 @@
plexus/ \
junit \
):target/classes:target/test-classes
-ant -Dmaven.mode.offline=true dist \
+ant -Dmaven.mode.offline=true -Dlog4j12.jar=%{_javadir}/log4j.jar dist \
-lib %{_javadir}
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2014-08-14 14:57:39
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
2014-06-30 22:49:41.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2014-08-14 14:57:42.0 +0200
@@ -1,0 +2,6 @@
+Tue Aug 12 11:10:06 UTC 2014 - lnus...@suse.de
+
+- add bcond java_bootstrap to build without unit tests
+ (commons-logging-1.1.3-src-junit.diff)
+
+---
New:
commons-logging-1.1.3-src-junit.diff
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.cDz3MM/_old 2014-08-14 14:57:43.0 +0200
+++ /var/tmp/diff_new_pack.cDz3MM/_new 2014-08-14 14:57:43.0 +0200
@@ -20,6 +20,7 @@
%define base_name logging
%define short_name commons-%{base_name}
+%bcond_with java_bootstrap
Name: apache-%{short_name}
Version:1.1.3
@@ -32,9 +33,12 @@
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
+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
@@ -84,6 +88,7 @@
%prep
%gpg_verify %{SOURCE1}
%setup -q -n %{short_name}-%{version}-src
+%patch0 -p1
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%pom_remove_dep :avalon-framework
++ commons-logging-1.1.3-src-junit.diff ++
Index: commons-logging-1.1.3-src/build.xml
===
--- commons-logging-1.1.3-src.orig/build.xml
+++ commons-logging-1.1.3-src/build.xml
@@ -719,7 +719,8 @@
- ant -Dtestmatch=**/FooTestCase testall
--
- target name=test depends=log4j12-test-warning, compile.tests
+ target name=test depends=log4j12-test-warning, compile.tests,
junit-present
+ if=junit.present
description=Run all unit tests
echo message=Test output can be found in directory
${build.home}/test-reports./
delete dir=${build.home}/test-reports/
@@ -773,4 +774,13 @@
/fail
/target
+ target name=test-junit-present
+available
classname=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask
property=junit.present/
+ /target
+ target name=junit-present depends=test-junit-present
unless=junit.present
+echo= WARNING
/echo
+echo Junit isnapos;t present in your $ANT_HOME/lib directory. Tests not
executed. /echo
+
echo==/echo
+ /target
+
/project
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2014-06-30 22:49:40
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
2013-09-11 13:39:32.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2014-06-30 22:49:41.0 +0200
@@ -1,0 +2,5 @@
+Fri Jun 27 13:22:19 UTC 2014 - tchva...@suse.com
+
+- Provides obsoletes to be versioned
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.E8YU2b/_old 2014-06-30 22:49:42.0 +0200
+++ /var/tmp/diff_new_pack.E8YU2b/_new 2014-06-30 22:49:42.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apache-commons-logging
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
@@ -54,8 +54,9 @@
Requires(postun):javapackages-tools
Provides: jakarta-%{short_name} = %{version}-%{release}
-Obsoletes: jakarta-%{short_name} = 1.0.4
+Obsoletes: jakarta-%{short_name} %{version}
Provides: %{short_name} = %{version}-%{release}
+Obsoletes: %{short_name} %{version}
%description
The commons-logging package provides a simple, component oriented
@@ -73,8 +74,8 @@
Summary:API documentation for %{name}
Group: Documentation
Requires: javapackages-tools
-
-Obsoletes: jakarta-%{short_name}-javadoc = 1.0.4
+Provides: jakarta-%{short_name}-javadoc = %{version}
+Obsoletes: jakarta-%{short_name}-javadoc %{version}
%descriptionjavadoc
API documentation for %{name}.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2013-09-11 13:39:30
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
2013-09-03 22:01:22.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2013-09-11 13:39:32.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 9 11:04:11 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.LWzWJX/_old 2013-09-11 13:39:33.0 +0200
+++ /var/tmp/diff_new_pack.LWzWJX/_new 2013-09-11 13:39:33.0 +0200
@@ -37,7 +37,7 @@
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
BuildRequires: java-devel = 1.6.0
-BuildRequires: jpackage-utils = 1.6
+BuildRequires: javapackages-tools
BuildRequires: junit
%if %with maven
BuildRequires: maven-plugin-build-helper
@@ -49,9 +49,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: java = 1.6.0
-Requires: jpackage-utils = 1.6
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
+Requires: javapackages-tools
+Requires(post): javapackages-tools
+Requires(postun):javapackages-tools
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} = 1.0.4
@@ -72,7 +72,7 @@
%packagejavadoc
Summary:API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
+Requires: javapackages-tools
Obsoletes: jakarta-%{short_name}-javadoc = 1.0.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-logging for openSUSE:Factory
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.0 +0200
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2013-09-03 22:01:22.0 +0200
@@ -1,0 +2,14 @@
+Tue Aug 27 08:51:35 UTC 2013 - mvysko...@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.0 +0200
+++ /var/tmp/diff_new_pack.i4Bmrq/_new 2013-09-03 22:01:23.0 +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
%packagejavadoc
Summary:API documentation for %{name}
Group: Documentation
@@ -81,27 +79,26 @@
%descriptionjavadoc
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
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2012-04-03 19:52:11
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
Package is apache-commons-logging, Maintainer is
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2012-03-07 13:40:54.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2012-04-03 19:52:13.0 +0200
@@ -1,0 +2,5 @@
+Mon Apr 2 13:39:00 UTC 2012 - mvysko...@suse.cz
+
+- provide commons-logging
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.aXdve4/_old 2012-04-03 19:52:24.0 +0200
+++ /var/tmp/diff_new_pack.aXdve4/_new 2012-04-03 19:52:24.0 +0200
@@ -57,6 +57,7 @@
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} = 1.0.4
+Provides: %{short_name} = %{version}-%{release}
%description
The commons-logging package provides a simple, component oriented
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit apache-commons-logging for openSUSE:Factory
Hello community,
here is the log from the commit of package apache-commons-logging for
openSUSE:Factory checked in at 2012-03-07 13:40:53
Comparing /work/SRC/openSUSE:Factory/apache-commons-logging (Old)
and /work/SRC/openSUSE:Factory/.apache-commons-logging.new (New)
Package is apache-commons-logging, Maintainer is
Changes:
---
/work/SRC/openSUSE:Factory/apache-commons-logging/apache-commons-logging.changes
2012-02-24 06:52:37.0 +0100
+++
/work/SRC/openSUSE:Factory/.apache-commons-logging.new/apache-commons-logging.changes
2012-03-07 13:40:54.0 +0100
@@ -1,0 +2,6 @@
+Tue Feb 28 13:50:53 UTC 2012 - mvysko...@suse.cz
+
+- fix build cycle, do not require avalon-* for build and use servletapi5
+ instead of tomcat6 package
+
+---
Other differences:
--
++ apache-commons-logging.spec ++
--- /var/tmp/diff_new_pack.B1PxyY/_old 2012-03-07 13:40:55.0 +0100
+++ /var/tmp/diff_new_pack.B1PxyY/_new 2012-03-07 13:40:55.0 +0100
@@ -39,8 +39,6 @@
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
-BuildRequires: avalon-framework
-BuildRequires: avalon-logkit
BuildRequires: java-devel = 1.6.0
BuildRequires: jpackage-utils = 1.6
BuildRequires: junit
@@ -48,7 +46,7 @@
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-site-plugin
%endif
-BuildRequires: servlet25
+BuildRequires: servletapi5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
