[cxf-xjc-utils] Make it buildable again
Marek Goldmann
goldmann at fedoraproject.org
Tue Mar 24 05:54:54 UTC 2015
commit 48b5914d5ababc4f3fca92a601526c587d33dbf0
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Tue Mar 24 06:54:21 2015 +0100
Make it buildable again
- Upstream release 2.6.2
- Switch to xmvn
- Fixes RHBZ#1106115
.gitignore | 1 +
cxf-xjc-utils-2.6.0-pom.patch | 20 ------------
cxf-xjc-utils.spec | 73 +++++++++++--------------------------------
sources | 2 +-
4 files changed, 21 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3c66e36..35e5adc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/cxf-xjc-utils-2.6.0.tar.xz
+/cxf-xjc-utils-2.6.2.tar.xz
diff --git a/cxf-xjc-utils.spec b/cxf-xjc-utils.spec
index f11439b..3af909c 100644
--- a/cxf-xjc-utils.spec
+++ b/cxf-xjc-utils.spec
@@ -1,20 +1,19 @@
Name: cxf-xjc-utils
-Version: 2.6.0
-Release: 8%{?dist}
+Version: 2.6.2
+Release: 1%{?dist}
Summary: Apache CXF XJC-Utils
Group: Development/Libraries
License: ASL 2.0
URL: http://cxf.apache.org/xjc-utils.html
-# svn export http://svn.apache.org/repos/asf/cxf/xjc-utils/tags/xjc-utils-2.6.0/ cxf-xjc-utils-2.6.0
-# tar cafJ cxf-xjc-utils-2.6.0.tar.xz cxf-xjc-utils-2.6.0
+# svn export http://svn.apache.org/repos/asf/cxf/xjc-utils/tags/xjc-utils-2.6.2/ cxf-xjc-utils-2.6.2
+# tar cafJ cxf-xjc-utils-2.6.2.tar.xz cxf-xjc-utils-2.6.2
-Source0: %{name}-%{version}.tar.xz
-
-Patch0: %{name}-%{version}-pom.patch
+Source0: cxf-xjc-utils-%{version}.tar.xz
BuildArch: noarch
+BuildRequires: cxf-build-utils
BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven-local
@@ -23,6 +22,7 @@ BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shade-plugin
+BuildRequires: maven-checkstyle-plugin
BuildRequires: apache-commons-lang
BuildRequires: glassfish-jaxb
BuildRequires: glassfish-jaxb-api
@@ -30,18 +30,10 @@ BuildRequires: junit
BuildRequires: jvnet-parent
BuildRequires: maven-project
BuildRequires: maven-shared-downloader
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
BuildRequires: ws-jaxme
BuildRequires: wsdl4j
-Requires: jpackage-utils
-Requires: java-headless
-Requires: apache-commons-lang
-Requires: glassfish-jaxb
-Requires: junit
-Requires: ws-jaxme
-Requires: wsdl4j
-
%description
The Apache CXF XJC-Utils provides a bunch of utilities for working
with JAXB to generate better or more usable code.
@@ -57,52 +49,25 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1
+%pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin
+%pom_disable_module bug671
%build
-# test fail because of missing dependencies
-mvn-rpmbuild \
- -Dmaven.test.skip=true \
- -Dproject.build.sourceEncoding=UTF-8 \
- package javadoc:aggregate
-
+%mvn_build -f
%install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-for module in boolean bug671 cxf-xjc-plugin dv \
- property-listener runtime ts wsdlextension;
-do
- pushd $module
+%mvn_install
- case $module in
- cxf-xjc-plugin) module=plugin ;;
- property-listener) module=pl ;;
- esac
+%files -f .mfiles
+%dir %{_javadir}/%{name}
- install -pm 644 target/cxf-xjc-$module-%{version}.jar %{buildroot}%{_javadir}/%{name}/cxf-xjc-$module.jar
- install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-cxf-xjc-$module.pom
- %add_maven_depmap JPP.%{name}-cxf-xjc-$module.pom %{name}/cxf-xjc-$module.jar
- popd
-done
-
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
-%add_maven_depmap JPP.%{name}.pom
-
-# javadoc
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%changelog
+* Tue Mar 24 2015 Marek Goldmann <mgoldman at redhat.com> - 2.6.2-1
+- Upstream release 2.6.2
+- Switch to xmvn
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 3aa3f35..2243dc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b51370d33f601a82df61e9de4b359a14 cxf-xjc-utils-2.6.0.tar.xz
+c7c460415fa315165561b4cd03f97159 cxf-xjc-utils-2.6.2.tar.xz
More information about the scm-commits
mailing list