[jboss-connector-1.6-api] Upstream release 1.0.1.Final

Marek Goldmann goldmann at fedoraproject.org
Tue Mar 24 06:11:43 UTC 2015


commit b4dbc5eadd596939b1c715dcb2d6b33f3cf105e2
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Mar 24 07:11:22 2015 +0100

    Upstream release 1.0.1.Final
    
    - Switch to xmvn

 .gitignore                   |  1 +
 jboss-connector-1.6-api.spec | 47 ++++++++++++--------------------------------
 sources                      |  2 +-
 3 files changed, 15 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c34640e..01ae870 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jboss-connector-1.6-api-1.0.1.20120310git9dc9a5.tar.xz
+/jboss-connector-api_1.6_spec-1.0.1.Final.tar.gz
diff --git a/jboss-connector-1.6-api.spec b/jboss-connector-1.6-api.spec
index 8f41418..4529f80 100644
--- a/jboss-connector-1.6-api.spec
+++ b/jboss-connector-1.6-api.spec
@@ -1,18 +1,15 @@
-%global namedreltag .20120310git9dc9a5
+%global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-connector-1.6-api
 Version:          1.0.1
-Release:          0.7%{namedreltag}%{?dist}
+Release:          1%{?dist}
 Summary:          Connector Architecture 1.6 API
 Group:            Development/Libraries
 License:          CDDL or GPLv2 with exceptions
 URL:              http://www.jboss.org
 
-# git clone git://github.com/jboss/jboss-connector-api_spec.git jboss-connector-1.6-api
-# cd jboss-connector-1.6-api/ && git archive --format=tar --prefix=jboss-connector-1.6-api/ 9dc9a58fb8672609790db93abcaac3875901243c | xz > jboss-connector-1.6-api-1.0.1.20120310git9dc9a5.tar.xz
-
-Source0:          %{name}-%{namedversion}.tar.xz
+Source0:          https://github.com/jboss/jboss-connector-api_spec/archive/jboss-connector-api_1.6_spec-%{namedversion}.tar.gz
 
 BuildRequires:    java-devel
 BuildRequires:    jboss-specs-parent
@@ -25,10 +22,6 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    jboss-transaction-1.1-api
 
-Requires:         java
-Requires:         jboss-transaction-1.1-api
-Requires:         jpackage-utils
-
 BuildArch:        noarch
 
 %description
@@ -37,45 +30,31 @@ Java EE Connector Architecture 1.6 API classes
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n jboss-connector-api_spec-jboss-connector-api_1.6_spec-%{namedversion}
 
 %build
-mvn-rpmbuild 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/jboss-connector-api_1.6_spec-%{version}-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc README LICENSE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Tue Mar 24 2015 Marek Goldmann <mgoldman at redhat.com> - 1.0.1-1
+- Upstream release 1.0.1.Final
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-0.7.20120310git9dc9a5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 013a759..46a5a25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa6744a04e058db5ccab5a5c93a0f976  jboss-connector-1.6-api-1.0.1.20120310git9dc9a5.tar.xz
+6eb8bd8e2a0c6e8d42f3f616641a9d27  jboss-connector-api_1.6_spec-1.0.1.Final.tar.gz


More information about the scm-commits mailing list