[glassfish-jsp-api] Update to latest packaging guidelines
Stanislav Ochotnicky
sochotni at fedoraproject.org
Mon Aug 5 15:35:30 UTC 2013
commit b1dc762b508853007e64a26033b27ada242b75e0
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon Aug 5 17:29:49 2013 +0200
Update to latest packaging guidelines
glassfish-jsp-api.spec | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/glassfish-jsp-api.spec b/glassfish-jsp-api.spec
index acd5f94..55f50f0 100644
--- a/glassfish-jsp-api.spec
+++ b/glassfish-jsp-api.spec
@@ -4,10 +4,9 @@
Name: glassfish-jsp-api
Version: 2.2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Glassfish J2EE JSP API specification
-Group: Development/Libraries
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL: http://java.net/jira/browse/JSP
Source0: %{artifactId}-%{version}.tar.xz
@@ -21,10 +20,7 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-source-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: jvnet-parent
BuildRequires: mvn(javax.servlet:javax.servlet-api)
BuildRequires: mvn(javax.el:javax.el-api)
@@ -40,7 +36,6 @@ specification. See glassfish-jsp for one of implementations
%package javadoc
Summary: API documentation for %{name}
-Group: Documentation
Requires: jpackage-utils >= 0:1.7.5
BuildArch: noarch
@@ -56,37 +51,22 @@ cp -p %{SOURCE3} cddllicense.txt
sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
%build
-mvn-rpmbuild install javadoc:javadoc
-
+%mvn_build
%install
+%mvn_install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-
-install -m 644 target/%{artifactId}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap
-
-%files
+%files -f .mfiles
%doc LICENSE cddllicense.txt
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE cddllicense.txt
-%{_javadocdir}/%{name}
%changelog
+* Mon Aug 05 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-8
+- Update to latest packaging guidelines
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list