[jboss-metadata] First version after review (#805967)

Juan Hernandez jhernand at fedoraproject.org
Thu Mar 22 18:54:37 UTC 2012


commit f4b10cb2848e8753c0cce77f8b223f896c987c13
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date:   Thu Mar 22 19:54:11 2012 +0100

    First version after review (#805967)

 .gitignore                           |    1 +
 jboss-metadata-fix-fsf-address.patch |   13 ++++
 jboss-metadata-pom.patch             |   16 ++++
 jboss-metadata.spec                  |  129 ++++++++++++++++++++++++++++++++++
 sources                              |    1 +
 5 files changed, 160 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..51a9db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jboss-metadata-7.0.1.Final.tar.xz
diff --git a/jboss-metadata-fix-fsf-address.patch b/jboss-metadata-fix-fsf-address.patch
new file mode 100644
index 0000000..8110900
--- /dev/null
+++ b/jboss-metadata-fix-fsf-address.patch
@@ -0,0 +1,13 @@
+diff --git a/common/LICENSE.txt b/common/LICENSE.txt
+index e043525..9e29e89 100644
+--- a/common/LICENSE.txt
++++ b/common/LICENSE.txt
+@@ -2,7 +2,7 @@
+ 		       Version 2.1, February 1999
+ 
+  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
diff --git a/jboss-metadata-pom.patch b/jboss-metadata-pom.patch
new file mode 100644
index 0000000..599eac1
--- /dev/null
+++ b/jboss-metadata-pom.patch
@@ -0,0 +1,16 @@
+diff -Naur jboss-metadata-7.0.0.Final/common/pom.xml jboss-metadata-7.0.0.Final-work/common/pom.xml
+--- jboss-metadata-7.0.0.Final/common/pom.xml	2012-02-06 17:33:27.000000000 +0100
++++ jboss-metadata-7.0.0.Final-work/common/pom.xml	2012-02-16 18:15:17.902999654 +0100
+@@ -104,12 +104,6 @@
+     </dependency>
+ 
+     <dependency>
+-      <groupId>sun-jaxb</groupId>
+-      <artifactId>jaxb-api</artifactId>
+-      <version>2.1.4</version>
+-    </dependency>
+-
+-    <dependency>
+        <groupId>org.jboss.spec.javax.annotation</groupId>
+        <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+        <version>1.0.0.Final</version>
diff --git a/jboss-metadata.spec b/jboss-metadata.spec
new file mode 100644
index 0000000..587d29b
--- /dev/null
+++ b/jboss-metadata.spec
@@ -0,0 +1,129 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+
+Name: jboss-metadata
+Version: 7.0.1
+Release: 1%{?dist}
+Summary: JBoss Metadata
+Group: Development/Libraries
+License: LGPLv2+
+URL: https://github.com/jboss/metadata
+
+# git clone git://github.com/jboss/metadata.git
+# cd metadata/ && git archive --format=tar --prefix=jboss-metadata-7.0.1.Final/ 7.0.1.Final | xz > jboss-metadata-7.0.1.Final.tar.xz
+Source0: %{name}-%{namedversion}.tar.xz
+
+# Remove the dependency on jaxb-api:
+Patch0: %{name}-pom.patch
+
+# Fix the FSF address in the copy of the license file that we are going to
+# include in the packages:
+Patch1: %{name}-fix-fsf-address.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-release-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: jboss-parent
+BuildRequires: jboss-logging
+BuildRequires: hibernate-jpa-2.0-api
+BuildRequires: jboss-ejb-3.1-api
+BuildRequires: jboss-ejb3-ext-api
+BuildRequires: jboss-interceptors-1.1-api
+BuildRequires: jboss-annotations-1.1-api
+BuildRequires: dos2unix
+
+Requires: jboss-annotations-1.1-api
+Requires: jboss-interceptors-1.1-api
+Requires: jpackage-utils
+Requires: java
+Requires: jboss-logging
+Requires: hibernate-jpa-2.0-api
+Requires: jboss-ejb-3.1-api
+Requires: jboss-ejb3-ext-api >= 2.0.0-0.1.beta2
+
+
+%description
+This package contains JBoss Metadata for JBoss AS 7.
+
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+
+%prep
+
+# Unpack and patch the sources:
+%setup -q -n %{name}-%{namedversion}
+%patch0 -p1
+%patch1 -p1
+
+# Fix the line ending in the license file:
+dos2unix common/LICENSE.txt
+
+
+%build
+# We don't have packaged all test dependencies (jboss-test for example):
+mvn-rpmbuild \
+  -Dmaven.test.skip=true \
+  install \
+  javadoc:aggregate
+
+
+%install
+
+# Create the directories:
+install -d -m 755 %{buildroot}%{_javadir}/%{name}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_mavendepmapfragdir}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+
+# Jar and POM files:
+for module in common ejb web ear appclient; do
+  install -pm 644 ${module}/target/%{name}-${module}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${module}.jar
+  install -pm 644 ${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${module}.pom
+  %add_maven_depmap JPP.%{name}-%{name}-${module}.pom %{name}/%{name}-${module}.jar
+done
+
+# Parent POM file:
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-%{name}-parent.pom
+
+# Javadoc files:
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+
+%files
+%{_javadir}/%{name}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%doc common/LICENSE.txt
+
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc common/LICENSE.txt
+
+
+%changelog
+* Thu Mar 22 2012 Juan Hernandez <juan.hernandez at redhat.com> 7.0.1-1
+- Update to upstream version 7.0.1
+- Cleanup of the spec file
+
+* Wed Dec 14 2011 Marek Goldmann <mgoldman at redhat.com> 7.0.0-0.1.Beta32
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..d425028 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+91ad3488e3423ac0b54b1ae271efc705  jboss-metadata-7.0.1.Final.tar.xz


More information about the scm-commits mailing list