[jboss-iiop-client] New guidelines

Marek Goldmann goldmann at fedoraproject.org
Tue Jul 1 10:23:14 UTC 2014


commit 32b24416af3b5b74d1ea9a8c5439522a61d2d84e
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 1 12:23:19 2014 +0200

    New guidelines

 .gitignore             |    1 +
 jboss-iiop-client.spec |   46 ++++++++++++----------------------------------
 sources                |    2 +-
 3 files changed, 14 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d90d52..b2700ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jboss-iiop-client-1.0.0.Final.tar.xz
+/1.0.0.Final.tar.gz
diff --git a/jboss-iiop-client.spec b/jboss-iiop-client.spec
index 159f7af..9f62cd5 100644
--- a/jboss-iiop-client.spec
+++ b/jboss-iiop-client.spec
@@ -3,19 +3,15 @@
 
 Name:             jboss-iiop-client
 Version:          1.0.0
-Release:          9%{?dist}
+Release:          10%{?dist}
 Summary:          JBoss IIOP Client
 Group:            Development/Libraries
 License:          LGPLv2+
 URL:              http://www.jboss.org/jbossiiop
-
-# git clone git://github.com/jbossas/jboss-iiop-client.git
-# cd jboss-iiop-client/ && git archive --format=tar --prefix=jboss-iiop-client-1.0.0.Final/ 1.0.0.Final | xz > jboss-iiop-client-1.0.0.Final.tar.xz
-Source0:          %{name}-%{namedversion}.tar.xz
+Source0:          https://github.com/jbossas/jboss-iiop-client/archive/1.0.0.Final.tar.gz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -31,12 +27,9 @@ BuildRequires:    maven-eclipse-plugin
 BuildRequires:    maven-ejb-plugin
 BuildRequires:    jboss-ejb-3.1-api
 BuildRequires:    jboss-parent
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    junit
 
-Requires:         jpackage-utils
-Requires:         jboss-ejb-3.1-api
-
 %description
 Client library for EJB applications working against JBoss AS using
 the IIOP protocol
@@ -44,43 +37,28 @@ the IIOP protocol
 %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}-%{namedversion}
+%setup -q -n jboss-iiop-client-%{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-iiop-client-%{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
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jul 01 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.0-10
+- New guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 0f39862..ed3cc80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-314451e0bb66b22d8e4f0f316c754621  jboss-iiop-client-1.0.0.Final.tar.xz
+a674fc47c7fc03229733fbb9efdf0d1d  1.0.0.Final.tar.gz


More information about the scm-commits mailing list