[jbossws-common-tools] Upstream release 1.2.0.Final
Marek Goldmann
goldmann at fedoraproject.org
Tue Aug 6 09:53:31 UTC 2013
commit bbf5f469da4d155a8c4a39dc30d9d4f9ce6d16e1
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Tue Aug 6 11:53:20 2013 +0200
Upstream release 1.2.0.Final
.gitignore | 1 +
jbossws-common-tools.spec | 63 +++++++++++---------------------------------
sources | 2 +-
3 files changed, 18 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f09fb5c..602cf01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jbossws-common-tools-1.1.0.Final.tar.xz
+/jbossws-common-tools-1.2.0.Final.tar.xz
diff --git a/jbossws-common-tools.spec b/jbossws-common-tools.spec
index b7f93b3..76987d9 100644
--- a/jbossws-common-tools.spec
+++ b/jbossws-common-tools.spec
@@ -2,25 +2,22 @@
%global namedversion %{version}%{?namedreltag}
Name: jbossws-common-tools
-Version: 1.1.0
-Release: 8%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
Summary: JBossWS Common Tools
Group: Development/Libraries
License: LGPLv2+ and ASL 2.0
URL: http://www.jboss.org/jbossws
-# svn export http://anonsvn.jboss.org/repos/jbossws/common-tools/tags/jbossws-common-tools-1.1.0.Final/ jbossws-common-tools-1.1.0.Final
-# tar cafJ jbossws-common-tools-1.1.0.Final.tar.xz jbossws-common-tools-1.1.0.Final
+# svn export http://anonsvn.jboss.org/repos/jbossws/common-tools/tags/jbossws-common-tools-1.2.0.Final/ jbossws-common-tools-1.2.0.Final
+# tar cafJ jbossws-common-tools-1.2.0.Final.tar.xz jbossws-common-tools-1.2.0.Final
Source0: jbossws-common-tools-%{namedversion}.tar.xz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
BuildRequires: ant
BuildRequires: maven-local
-BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-dependency-plugin
BuildRequires: maven-install-plugin
@@ -31,24 +28,13 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-surefire-provider-junit4
BuildRequires: gnu-getopt
-BuildRequires: jbossws-spi >= 2.1.0
-BuildRequires: jbossws-api >= 1.0.1
+BuildRequires: jbossws-spi
+BuildRequires: jbossws-api
BuildRequires: jbossws-parent
BuildRequires: log4j
BuildRequires: junit
-
-%if 0%{?fedora} > 17
-BuildRequires: plexus-pom
-BuildRequires: plexus-components-pom
-%endif
-
-Requires: jpackage-utils
-Requires: java
-Requires: ant
-Requires: gnu-getopt
-Requires: jbossws-spi >= 2.1.0
-Requires: jbossws-api >= 1.0.1
-Requires: log4j
+BuildRequires: plexus-pom
+BuildRequires: plexus-components-pom
%description
JBoss Web Services - Common Tools
@@ -56,7 +42,6 @@ JBoss Web Services - Common Tools
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -67,38 +52,22 @@ This package contains the API documentation for %{name}.
cp %{SOURCE1} .
%build
-mvn-rpmbuild \
- -Dproject.build.sourceEncoding=UTF-8 \
- install javadoc:aggregate
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# DEPMAP
-%add_maven_depmap
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE-2.0.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE-2.0.txt
%changelog
+* Tue Aug 06 2013 Marek Goldmann <mgoldman at redhat.com> - 1.2.0-1
+- Upstream release 1.2.0.Final
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 355c0e3..8110288 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7cccb28037cbe9b7751667936e12573 jbossws-common-tools-1.1.0.Final.tar.xz
+5d6e01ac8af059f4a8290ebbfac402fa jbossws-common-tools-1.2.0.Final.tar.xz
More information about the scm-commits
mailing list