[jibx] update to 1.2.6, rhbz#1178346
gil
gil at fedoraproject.org
Sun Jan 4 18:07:46 UTC 2015
commit 380bf30e3300e22f0b73bfdda55c26064e8659ed
Author: gil <puntogil at libero.it>
Date: Sun Jan 4 19:07:33 2015 +0100
update to 1.2.6, rhbz#1178346
.gitignore | 1 +
jibx-1.2.5-poms.patch => jibx-1.2.6-poms.patch | 83 ++++++++++++------------
jibx.spec | 44 ++++++-------
sources | 2 +-
4 files changed, 63 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16ff71a..afb0394 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/jibx_1_2_3.zip
/jibx_1_2_4.zip
/jibx_1_2_5.zip
+/jibx_1_2_6.zip
diff --git a/jibx-1.2.5-poms.patch b/jibx-1.2.6-poms.patch
similarity index 70%
rename from jibx-1.2.5-poms.patch
rename to jibx-1.2.6-poms.patch
index f52beac..1ae9801 100644
--- a/jibx-1.2.5-poms.patch
+++ b/jibx-1.2.6-poms.patch
@@ -1,12 +1,12 @@
-diff -Nru build/maven/jibx-bind/pom.xml build/maven-gil/jibx-bind/pom.xml
---- build/maven/jibx-bind/pom.xml 2012-05-02 09:51:18.000000000 +0200
-+++ build/maven-gil/jibx-bind/pom.xml 2012-05-26 16:11:24.000000000 +0200
+diff -Nru jibx/build/maven/jibx-bind/pom.xml jibx-gil/build/maven/jibx-bind/pom.xml
+--- jibx/build/maven/jibx-bind/pom.xml 2014-12-30 21:17:06.000000000 +0100
++++ jibx-gil/build/maven/jibx-bind/pom.xml 2015-01-04 18:14:23.938657295 +0100
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jibx.config</groupId>
<artifactId>main-reactor</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</parent>
<groupId>org.jibx</groupId>
@@ -24,20 +24,20 @@ diff -Nru build/maven/jibx-bind/pom.xml build/maven-gil/jibx-bind/pom.xml
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jibx-run</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</dependency>
<dependency>
-diff -Nru build/maven/jibx-extras/pom.xml build/maven-gil/jibx-extras/pom.xml
---- build/maven/jibx-extras/pom.xml 2012-05-02 09:51:18.000000000 +0200
-+++ build/maven-gil/jibx-extras/pom.xml 2012-05-26 16:11:24.000000000 +0200
+diff -Nru jibx/build/maven/jibx-extras/pom.xml jibx-gil/build/maven/jibx-extras/pom.xml
+--- jibx/build/maven/jibx-extras/pom.xml 2014-12-30 21:17:06.000000000 +0100
++++ jibx-gil/build/maven/jibx-extras/pom.xml 2015-01-04 18:15:07.157501708 +0100
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jibx.config</groupId>
<artifactId>main-reactor</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</parent>
<groupId>org.jibx</groupId>
@@ -55,20 +55,20 @@ diff -Nru build/maven/jibx-extras/pom.xml build/maven-gil/jibx-extras/pom.xml
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jibx-run</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</dependency>
<dependency>
-diff -Nru build/maven/jibx-run/pom.xml build/maven-gil/jibx-run/pom.xml
---- build/maven/jibx-run/pom.xml 2012-05-02 09:51:18.000000000 +0200
-+++ build/maven-gil/jibx-run/pom.xml 2012-05-26 16:11:24.000000000 +0200
+diff -Nru jibx/build/maven/jibx-run/pom.xml jibx-gil/build/maven/jibx-run/pom.xml
+--- jibx/build/maven/jibx-run/pom.xml 2014-12-30 21:17:06.000000000 +0100
++++ jibx-gil/build/maven/jibx-run/pom.xml 2015-01-04 18:15:43.957666260 +0100
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jibx.config</groupId>
<artifactId>main-reactor</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</parent>
<groupId>org.jibx</groupId>
@@ -82,15 +82,15 @@ diff -Nru build/maven/jibx-run/pom.xml build/maven-gil/jibx-run/pom.xml
</instructions>
</configuration>
</plugin>
-diff -Nru build/maven/jibx-schema/pom.xml build/maven-gil/jibx-schema/pom.xml
---- build/maven/jibx-schema/pom.xml 2012-05-02 09:51:18.000000000 +0200
-+++ build/maven-gil/jibx-schema/pom.xml 2012-05-26 16:11:24.000000000 +0200
+diff -Nru jibx/build/maven/jibx-schema/pom.xml jibx-gil/build/maven/jibx-schema/pom.xml
+--- jibx/build/maven/jibx-schema/pom.xml 2014-12-30 21:17:06.000000000 +0100
++++ jibx-gil/build/maven/jibx-schema/pom.xml 2015-01-04 18:16:21.167810364 +0100
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jibx.config</groupId>
<artifactId>main-reactor</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</parent>
<groupId>org.jibx</groupId>
@@ -107,26 +107,26 @@ diff -Nru build/maven/jibx-schema/pom.xml build/maven-gil/jibx-schema/pom.xml
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jibx-bind</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jibx-extras</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</dependency>
</dependencies>
-diff -Nru build/maven/jibx-tools/pom.xml build/maven-gil/jibx-tools/pom.xml
---- build/maven/jibx-tools/pom.xml 2012-05-02 09:51:18.000000000 +0200
-+++ build/maven-gil/jibx-tools/pom.xml 2012-05-26 16:11:24.000000000 +0200
+diff -Nru jibx/build/maven/jibx-tools/pom.xml jibx-gil/build/maven/jibx-tools/pom.xml
+--- jibx/build/maven/jibx-tools/pom.xml 2014-12-30 21:17:06.000000000 +0100
++++ jibx-gil/build/maven/jibx-tools/pom.xml 2015-01-04 18:18:10.831340776 +0100
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jibx.config</groupId>
<artifactId>main-reactor</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</parent>
<groupId>org.jibx</groupId>
@@ -150,12 +150,12 @@ diff -Nru build/maven/jibx-tools/pom.xml build/maven-gil/jibx-tools/pom.xml
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jibx-schema</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
-+ <version>1.2.5</version>
+- <version>1.2.6-SNAPSHOT</version>
++ <version>1.2.6</version>
</dependency>
- <!-- Eclipse dependencies -->
-+ <!-- Eclipse dependencies >
++ <!-- Eclipse dependencies
<dependency>
<groupId>org.jibx.config.3rdparty.org.eclipse</groupId>
<artifactId>org.eclipse.core.contenttype</artifactId>
@@ -168,9 +168,9 @@ diff -Nru build/maven/jibx-tools/pom.xml build/maven-gil/jibx-tools/pom.xml
</dependencies>
</project>
-diff -Nru build/maven/pom.xml build/maven-gil/pom.xml
---- build/maven/pom.xml 2012-05-02 09:51:18.000000000 +0200
-+++ build/maven-gil/pom.xml 2012-05-26 16:29:27.892538845 +0200
+diff -Nru jibx/build/maven/pom.xml jibx-gil/build/maven/pom.xml
+--- jibx/build/maven/pom.xml 2014-12-30 21:17:06.000000000 +0100
++++ jibx-gil/build/maven/pom.xml 2015-01-04 18:12:48.452419775 +0100
@@ -2,15 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -178,15 +178,14 @@ diff -Nru build/maven/pom.xml build/maven-gil/pom.xml
- <parent>
- <groupId>org.jibx.config</groupId>
- <artifactId>core-reactor</artifactId>
-- <version>1.2.5-SNAPSHOT</version>
+- <version>1.2.6-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
+ <groupId>org.jibx.config</groupId>
<artifactId>main-reactor</artifactId>
-
-+ <version>1.2.5</version>
++ <version>1.2.6</version>
<packaging>pom</packaging>
<name>main-reactor - JiBX main reactor</name>
<description>JiBX main reactor</description>
-
diff --git a/jibx.spec b/jibx.spec
index 5180d15..d314774 100644
--- a/jibx.spec
+++ b/jibx.spec
@@ -1,14 +1,14 @@
%global debug_package %{nil}
-
+%global _version 1_2_6
Name: jibx
-Version: 1.2.5
-Release: 9%{?dist}
+Version: 1.2.6
+Release: 1%{?dist}
Summary: Framework for binding XML data to Java objects
License: BSD and ASL 1.1
URL: http://sourceforge.net/projects/jibx/
-Source0: http://sourceforge.net/projects/jibx/files/jibx/jibx-1.2.5/%{name}_1_2_5.zip
+Source0: http://sourceforge.net/projects/jibx/files/jibx/jibx-%{version}/%{name}_%{_version}.zip
Patch0: %{name}-classpath.patch
-Patch1: %{name}-%{version}-poms.patch
+Patch1: %{name}-1.2.6-poms.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant
@@ -26,8 +26,7 @@ BuildRequires: dom4j
BuildRequires: jdom
BuildRequires: xpp3
BuildRequires: log4j12
-
-Requires: jpackage-utils
+BuildRequires: javapackages-local
%description
JiBX is a framework for binding XML data to Java objects. It lets you
@@ -45,7 +44,7 @@ This package contains the API documentation for %{name}.
#Patch to add the bundled jar dependencies in the classpath
%patch0 -p1
#Patch to add maven poms
-%patch1 -p0
+%patch1 -p1
find -name '*.class' -delete
find -name '*.jar' -delete
@@ -108,6 +107,11 @@ sed -i '/Class-Path/I d' %{_builddir}/%{name}/build/build.xml
#sed -i 's|log4j*.jar|log4j12-1.2.17.jar|' %%{_builddir}/%%{name}/build/build.xml
%build
+
+for sub_component in bind extras run schema tools; do
+%mvn_file org.%{name}:%{name}-${sub_component} %{name}/${sub_component}
+done
+
pushd build/
sed -i -e s:stax-api.jar:bea-stax-api.jar:g build.xml
# thanks to msrb at redhat.com
@@ -115,34 +119,26 @@ sed -i 's|version}" arg2="1.5"|version}" arg2="1.8"|g' build.xml
javac jenable/JEnable.java
export CLASSPATH=$(build-classpath junit)
-ant current -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 #test-multiples test-singles test-extras basic-blackbox blackbox devdoc javadoc
+ant current -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 devdoc #test-multiples test-singles test-extras basic-blackbox blackbox devdoc javadoc
%install
-install -d -m 755 %{buildroot}/%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-main-reactor.pom
-%add_maven_depmap JPP.%{name}-main-reactor.pom
-
+%mvn_artifact build/maven/pom.xml
for sub_component in bind extras run schema tools; do
-install -m 644 lib/%{name}-${sub_component}.jar \
-%{buildroot}/%{_javadir}/%{name}/${sub_component}.jar
-install -pm 644 build/maven/jibx-${sub_component}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${sub_component}.pom
-%add_maven_depmap JPP.%{name}-${sub_component}.pom %{name}/${sub_component}.jar
+%mvn_artifact build/maven/jibx-${sub_component}/pom.xml lib/%{name}-${sub_component}.jar
done
-mkdir -p %{buildroot}/%{_javadocdir}/%{name}
-cp -rp %{_builddir}/%{name}/build/docs/* \
-%{buildroot}/%{_javadocdir}/%{name}/
+%mvn_install -J %{_builddir}/%{name}/build/api
%files -f .mfiles
%dir %{_javadir}/%{name}
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%changelog
+* Sun Jan 04 2015 gil cattaneo <puntogil at libero.it> 1.2.6-1
+- update to 1.2.6, rhbz#1178346
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index c1bac86..0e013ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc598103c04f6ede8fa87c99e5bde113 jibx_1_2_5.zip
+092ac997a311c2904a1e869944741fb3 jibx_1_2_6.zip
More information about the scm-commits
mailing list