[jboss-ejb-3.1-api] New guidelines
Marek Goldmann
goldmann at fedoraproject.org
Tue Jul 1 09:30:38 UTC 2014
commit fc22b12bce6e1c5122bc67d40c5c0a3d5994e290
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Tue Jul 1 11:30:42 2014 +0200
New guidelines
.gitignore | 1 +
jboss-ejb-3.1-api.spec | 45 +++++++++++----------------------------------
sources | 2 +-
3 files changed, 13 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e68f09..8f56438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/jboss-ejb-3.1-api-1.0.2.20120309git53fbe3.tar.xz
/jboss-ejb-3.1-api-1.0.2.Final.tar.xz
+/jboss-ejb-api_3.1_spec-1.0.2.Final.tar.gz
diff --git a/jboss-ejb-3.1-api.spec b/jboss-ejb-3.1-api.spec
index a2ec27d..d4b91b7 100644
--- a/jboss-ejb-3.1-api.spec
+++ b/jboss-ejb-3.1-api.spec
@@ -3,21 +3,17 @@
Name: jboss-ejb-3.1-api
Version: 1.0.2
-Release: 10%{dist}
+Release: 11%{dist}
Summary: EJB 3.1 API
Group: Development/Libraries
License: CDDL or GPLv2 with exceptions
Url: http://www.jboss.org
-
-# git clone git://github.com/jboss/jboss-ejb-api_spec.git jboss-ejb-3.1-api
-# cd jboss-ejb-3.1-api/ && git archive --format=tar --prefix=jboss-ejb-3.1-api/ jboss-ejb-api_3.1_spec-1.0.2.Final | xz > jboss-ejb-3.1-api-1.0.2.Final.tar.xz
-Source0: jboss-ejb-3.1-api-%{namedversion}.tar.xz
+Source0: https://github.com/jboss/jboss-ejb-api_spec/archive/jboss-ejb-api_3.1_spec-%{namedversion}.tar.gz
BuildRequires: jboss-transaction-1.1-api
BuildRequires: jboss-jaxrpc-1.1-api
BuildRequires: java-devel
BuildRequires: jboss-specs-parent
-BuildRequires: jpackage-utils
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -28,9 +24,6 @@ BuildRequires: maven-plugin-cobertura
BuildRequires: maven-dependency-plugin
BuildRequires: maven-ear-plugin
-Requires: jboss-transaction-1.1-api
-Requires: jboss-jaxrpc-1.1-api
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -38,46 +31,30 @@ The Java EJB 3.1 API classes.
%package javadoc
Summary: Javadocs for %{name}
-Group: Development/Libraries
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n jboss-ejb-3.1-api
+%setup -q -n jboss-ejb-api_spec-jboss-ejb-api_3.1_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-ejb-api_3.1_spec-%{namedversion}.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 Jul 01 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.2-11
+- New guidelines
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index ecb52e1..cacec89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbe97410d13070e0f5e284bc9b40c7a5 jboss-ejb-3.1-api-1.0.2.Final.tar.xz
+29343d3c70c70272fcd5ed68269959d3 jboss-ejb-api_3.1_spec-1.0.2.Final.tar.gz
More information about the scm-commits
mailing list