commit 0f79cc8154ddb0d1e902f88875a64a48037def22 Author: David Xie davidx@fedoraproject.org Date: Sat Jul 6 00:16:29 2013 +0800
Bump to v3.1.0
Lost spec file in last commit, will be more careful
glassfish-servlet-api.spec | 57 +++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 37 deletions(-) --- diff --git a/glassfish-servlet-api.spec b/glassfish-servlet-api.spec index 1cdaca7..f6441b2 100644 --- a/glassfish-servlet-api.spec +++ b/glassfish-servlet-api.spec @@ -1,29 +1,23 @@ %global artifactId javax.servlet-api -%global full_version 3.1-b07
Name: glassfish-servlet-api -Version: 3.1 -Release: 0.1.b07%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Java Servlet API -Group: Development/Libraries License: (CDDL or GPLv2 with exceptions) and ASL 2.0 URL: http://servlet-spec.java.net -# svn export https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-3.1-b07 javax.servlet-api-3.1-b07 -# tar cvJf javax.servlet-api-3.1-b07.tar.xz javax.servlet-api-3.1-b07/ -Source0: %{artifactId}-%{full_version}.tar.xz +# svn export https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-3.1.0 javax.servlet-api-3.1.0 +# tar cvJf javax.servlet-api-3.1.0.tar.xz javax.servlet-api-3.1.0/ +Source0: %{artifactId}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Patch0: remove-glassfish-servlet-api-legal.patch + BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils BuildRequires: jvnet-parent BuildRequires: maven-local -BuildRequires: maven BuildRequires: maven-source-plugin
-Requires: java -Requires: jpackage-utils
%description The javax.servlet package contains a number of classes @@ -32,47 +26,36 @@ a servlet class and the runtime environment provided for an instance of such a class by a conforming servlet container.
%package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc API documentation for %{name}.
%prep -%setup -q -n %{artifactId}-%{full_version} -%patch0 +%setup -q -n %{artifactId}-%{version} +%pom_remove_plugin :maven-remote-resources-plugin cp -p %{SOURCE1} . +# README contains also part of javax.servlet-api license +cp -p src/main/resources/META-INF/README . +%mvn_file :%{artifactId} %{name}
%build -mvn-rpmbuild install javadoc:javadoc - -%install -# jars -install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 target/%{artifactId}-%{full_version}.jar \ - %{buildroot}%{_javadir}/%{name}.jar
-# poms -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%mvn_build
-%add_maven_depmap JPP-%{name}.pom %{name}.jar - -# javadoc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ -rm -rf target/site/api* +%install +%mvn_install
%files -f .mfiles -%doc LICENSE-2.0.txt +%doc LICENSE-2.0.txt README
-%files javadoc -%doc LICENSE-2.0.txt -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc +%doc LICENSE-2.0.txt README
%changelog +* Thu Jul 04 2013 gil cattaneo puntogil@libero.it - 3.1.0-1 +- Update to 3.1.0 + * Sat Mar 09 2013 David Xie david.scriptfan@gmail.com - 3.1-0.1.b07 - Initial version of package
java-sig-commits@lists.fedoraproject.org