Hello community,
here is the log from the commit of package avalon-framework for
openSUSE:Factory checked in at 2019-01-29 14:40:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/avalon-framework (Old)
and /work/SRC/openSUSE:Factory/.avalon-framework.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avalon-framework"
Tue Jan 29 14:40:04 2019 rev:12 rq:667678 version:4.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/avalon-framework/avalon-framework.changes
2018-07-24 17:31:02.211959784 +0200
+++
/work/SRC/openSUSE:Factory/.avalon-framework.new.28833/avalon-framework.changes
2019-01-29 14:40:09.127424885 +0100
@@ -1,0 +2,23 @@
+Mon Jan 21 15:57:04 UTC 2019 - Fridrich Strba <[email protected]>
+
+- Upgrade to 4.3
+ * Two source packages avalon-framework-api-4.3 and
+ avalon-framework-impl-4.3 buildable both with ant
+ * Make javadoc subpackage provide the manual subpackage, since
+ the manual content is basically a javadoc for api
+- Added patches:
+ * 0001-Port-build-script-to-Maven-3.patch
+ + convert the project.xml files in both sources to a valid
+ maven 3 pom files.
+ * avalon-framework-manifest.patch
+ + Add Bundle-SymbolicName attributes to both jar files
+- Removed patch:
+ * avalon-framework-target.patch
+ + not needed with this version
+
+-------------------------------------------------------------------
+Wed Dec 5 06:39:33 UTC 2018 - Fridrich Strba <[email protected]>
+
+- Add maven pom files
+
+-------------------------------------------------------------------
Old:
----
Avalon-4.1.4-src.tar.gz
avalon-framework-target.patch
New:
----
0001-Port-build-script-to-Maven-3.patch
avalon-framework-api-4.3-src.tar.gz
avalon-framework-impl-4.3-src.tar.gz
avalon-framework-manifest.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avalon-framework.spec ++++++
--- /var/tmp/diff_new_pack.4kydfE/_old 2019-01-29 14:40:09.783424085 +0100
+++ /var/tmp/diff_new_pack.4kydfE/_new 2019-01-29 14:40:09.787424081 +0100
@@ -1,8 +1,7 @@
#
# spec file for package avalon-framework
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2000-2007, JPackage Project
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,32 +12,30 @@
# 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/
#
-#
-%define short_Name Avalon
Name: avalon-framework
-Version: 4.1.4
+Version: 4.3
Release: 0
Summary: Java components interfaces
-License: Apache-1.1
+License: Apache-2.0
Group: Development/Libraries/Java
-Url: http://avalon.apache.org/framework/
-Source0:
http://archive.apache.org/dist/avalon/avalon-framework/v4.1.4/Avalon-4.1.4-src.tar.gz
-Patch1: %{name}-target.patch
+URL: http://avalon.apache.org/
+Source0:
http://archive.apache.org/dist/excalibur/avalon-framework/source/%{name}-api-%{version}-src.tar.gz
+Source1:
http://archive.apache.org/dist/excalibur/avalon-framework/source/%{name}-impl-%{version}-src.tar.gz
+Patch0: 0001-Port-build-script-to-Maven-3.patch
+Patch1: %{name}-manifest.patch
BuildRequires: ant
BuildRequires: avalon-logkit
+BuildRequires: commons-logging
BuildRequires: fdupes
-BuildRequires: java-devel >= 1.8
-BuildRequires: javapackages-tools
-BuildRequires: junit
+BuildRequires: javapackages-local
BuildRequires: log4j
-BuildRequires: xml-commons-apis >= 1.3
-Requires: xalan-j2
-Requires: xml-commons-apis >= 1.3
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: avalon-logkit
+Requires: commons-logging
+Requires: log4j
BuildArch: noarch
%description
@@ -50,68 +47,59 @@
also define the relationship (contract) a component has with peers,
ancestors and children.
-%package manual
-Summary: Manual for %{name}
-Group: Development/Libraries/Java
-
-%description manual
-Documentation for %{name}.
-
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Libraries/Java
+Group: Documentation/HTML
+Provides: %{name}-manual = %{version}-%{release}
+Obsoletes: %{name}-manual < %{version}-%{release}
%description javadoc
API documentation for %{name}.
%prep
-%setup -q -n %{short_Name}-%{version}
+%setup -qcT -a 0 -a 1
+%patch0 -p1
%patch1 -p1
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-
-# Fix for wrong-file-end-of-line-encoding problem
-for i in `find docs -iname "*.html"`; do sed -i 's/\r//' $i; done
-for i in `find docs -iname "*.css"`; do sed -i 's/\r//' $i; done
-for i in `find docs -iname "*.xml"`; do sed -i 's/\r//' $i; done
-sed -i 's/\r//' README.txt
-sed -i 's/\r//' LICENSE.txt
-sed -i 's/\r//' KEYS
-sed -i 's/\r//' docs/api/package-list
%build
-ant \
- -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
- -Djunit.jar=$(build-classpath junit) \
- -Dlogkit.jar=$(build-classpath avalon-logkit) \
- -Dlog4j.jar=$(build-classpath log4j) \
- all javadocs
+pushd %{name}-api-%{version}
+ mkdir -p target/lib
+ build-jar-repository -s target/lib avalon-logkit
+ %ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 dist
+popd
+pushd %{name}-impl-%{version}
+ mkdir -p target/lib
+ build-jar-repository -s target/lib avalon-logkit log4j commons-logging
+ cp ../%{name}-api-%{version}/target/*.jar target/lib/
+ %ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 dist
+popd
%install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-install -m 644 target/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
-cp -pr target/javadocs/* %{buildroot}%{_javadocdir}/%{name}
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}
-
-# compat symlinks
-install -d -m 0755 %{buildroot}/%{_javadir}/excalibur
-(cd %{buildroot}/%{_javadir}/excalibur;
-ln -sf ../avalon-framework.jar avalon-framework-impl.jar
-ln -sf ../avalon-framework.jar avalon-framework-api.jar)
-
-%files
-%defattr(0644,root,root,0755)
-%doc KEYS LICENSE.txt README.txt
-%{_javadir}/*.jar
-%{_javadir}/excalibur
-
-%files manual
-%defattr(0644,root,root,0755)
-%doc docs/*
+# jars
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 %{name}-api-%{version}/dist/%{name}-api-%{version}.jar
%{buildroot}%{_javadir}/%{name}-api.jar
+install -pm 0644 %{name}-impl-%{version}/dist/%{name}-impl-%{version}.jar
%{buildroot}%{_javadir}/%{name}-impl.jar
+(cd %{buildroot}%{_javadir} && ln -s %{name}-impl.jar %{name}.jar)
+# poms
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+install -pm 0644 %{name}-api-%{version}/project.xml
%{buildroot}%{_mavenpomdir}/%{name}-api.pom
+%add_maven_depmap %{name}-api.pom %{name}-api.jar -a
org.apache.avalon.framework:avalon-framework-api
+install -pm 0644 %{name}-impl-%{version}/project.xml
%{buildroot}%{_mavenpomdir}/%{name}-impl.pom
+%add_maven_depmap %{name}-impl.pom %{name}-impl.jar -a
org.apache.avalon.framework:avalon-framework-impl
+# javadoc
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr %{name}-api-%{version}/dist/docs/api
%{buildroot}%{_javadocdir}/%{name}/api
+cp -pr %{name}-impl-%{version}/dist/docs/api
%{buildroot}%{_javadocdir}/%{name}/impl
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%{_javadir}/%{name}.jar
+%license avalon-framework-api-4.3/LICENSE.txt
+%license avalon-framework-api-4.3/NOTICE.txt
%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/*
+%{_javadocdir}/%{name}
+%license avalon-framework-api-4.3/LICENSE.txt
+%license avalon-framework-api-4.3/NOTICE.txt
%changelog
++++++ 0001-Port-build-script-to-Maven-3.patch ++++++
>From fe5bf9cd9a3395574ad5d96596dcbcd235b53040 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <[email protected]>
Date: Tue, 14 Jun 2016 14:21:15 +0200
Subject: [PATCH] Port build script to Maven 3
---
avalon-framework-api-4.3/project.xml | 19 +++++++--
avalon-framework-impl-4.3/project.xml | 73 +++++++++++------------------------
pom.xml | 11 ++++++
3 files changed, 50 insertions(+), 53 deletions(-)
create mode 100644 pom.xml
diff --git a/avalon-framework-api-4.3/project.xml
b/avalon-framework-api-4.3/project.xml
index e64d251..e36b6ac 100644
--- a/avalon-framework-api-4.3/project.xml
+++ b/avalon-framework-api-4.3/project.xml
@@ -16,12 +16,13 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../project-common.xml</extend>
+ <modelVersion>4.0.0</modelVersion>
<name>Avalon Framework API</name>
+ <groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <shortDescription>Avalon Framework API</shortDescription>
- <package>org.apache.avalon.framework</package>
+ <description>Avalon Framework API</description>
+ <version>4.3</version>
<dependencies>
<dependency>
@@ -29,5 +30,17 @@
<artifactId>avalon-logkit</artifactId>
<version>2.1</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ </build>
</project>
diff --git a/avalon-framework-impl-4.3/project.xml
b/avalon-framework-impl-4.3/project.xml
index d72efba..4022b4f 100644
--- a/avalon-framework-impl-4.3/project.xml
+++ b/avalon-framework-impl-4.3/project.xml
@@ -17,11 +17,13 @@
-->
<project>
- <extend>${basedir}/../project-common.xml</extend>
+ <modelVersion>4.0.0</modelVersion>
<name>Avalon Framework Implementation</name>
+ <groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <shortDescription>Avalon Framework Implementation</shortDescription>
+ <version>4.3</version>
+ <description>Avalon Framework Implementation</description>
<dependencies>
<dependency>
@@ -31,48 +33,16 @@
</dependency>
<dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.0.2</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <id>xerces</id>
- <version>2.4.0</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
- <id>xalan</id>
- <version>2.6.0</version>
- <properties note="Only required if not provided by JVM.">
- <optional>true</optional>
- </properties>
- </dependency>
-
- <dependency>
- <id>log4j</id>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>1.2.11</version>
- <properties note="Only required if log4j features are used.">
- <optional>true</optional>
- </properties>
+ <optional>true</optional>
</dependency>
- <dependency>
- <id>commons-logging</id>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <properties note="Only required if commons-logging features are
used.">
- <optional>true</optional>
- </properties>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>avalon-logkit</groupId>
@@ -80,18 +50,21 @@
<version>2.1</version>
</dependency>
<dependency>
- <id>junit</id>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<version>3.8.1</version>
- <properties note="Only required by tests.">
- <build>true</build>
- </properties>
+ <scope>test</scope>
</dependency>
<dependency>
- <id>jmock</id>
- <version>1.0.1</version>
- <properties note="Only required by tests.">
- <build>true</build>
- </properties>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a36ec55
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,11 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>placeholder</groupId>
+ <artifactId>aggregator</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>avalon-framework-api-4.3/project.xml</module>
+ <module>avalon-framework-impl-4.3/project.xml</module>
+ </modules>
+</project>
--
2.5.5
++++++ avalon-framework-manifest.patch ++++++
--- avalon-framework-4.3/avalon-framework-api-4.3/build.xml 2019-01-21
09:07:49.196418936 +0100
+++ avalon-framework-4.3/avalon-framework-api-4.3/build.xml 2019-01-21
09:24:00.241272925 +0100
@@ -96,6 +96,9 @@
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
<jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ <manifest>
+ <attribute name="Bundle-SymbolicName" value="${final.name}"/>
+ </manifest>
</jar>
</target>
<target name="clean" description="o Clean up the generated directories">
--- avalon-framework-4.3/avalon-framework-impl-4.3/build.xml 2019-01-21
09:07:49.232419116 +0100
+++ avalon-framework-4.3/avalon-framework-impl-4.3/build.xml 2019-01-21
09:24:05.393298710 +0100
@@ -96,6 +96,9 @@
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
<jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ <manifest>
+ <attribute name="Bundle-SymbolicName" value="${final.name}"/>
+ </manifest>
</jar>
</target>
<target name="clean" description="o Clean up the generated directories">
