Author: qboosh Date: Sat Feb 12 12:49:53 2011 GMT Module: packages Tag: HEAD ---- Log message: - symlinks and Provides cleanup (only versioned java(servlet) and java(jsp) left) - dropped BUILDING.txt from binary package docs
---- Files affected: packages/java-servletapi: java-servletapi.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: packages/java-servletapi/java-servletapi.spec diff -u packages/java-servletapi/java-servletapi.spec:1.36 packages/java-servletapi/java-servletapi.spec:1.37 --- packages/java-servletapi/java-servletapi.spec:1.36 Mon Nov 24 00:54:01 2008 +++ packages/java-servletapi/java-servletapi.spec Sat Feb 12 13:49:47 2011 @@ -7,37 +7,38 @@ %bcond_without javadoc # don't build javadoc # %include /usr/lib/rpm/macros.java -Summary: Java Servlet and JSP API Classes -Summary(pl.UTF-8): Klasy API z implementacją Java Servlet i JSP +Summary: Java Servlet 2.3 and JSP 1.2 API Classes +Summary(pl.UTF-8): Klasy API z implementacją Java Servlet 2.3 i JSP 1.2 Name: java-servletapi Version: 4 Release: 12 -License: Apache +License: Apache v1.1 Group: Libraries/Java Source0: http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0/src/jakarta-servletapi-%{version}-src.tar.gz # Source0-md5: cbf88ed51ee2be5a6ce3bace9d8bdb62 Patch0: jakarta-servletapi-ant.patch URL: http://tomcat.apache.org/ BuildRequires: ant >= 1.3 +BuildRequires: jdk >= 1.3 BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 -Provides: jakarta-servletapi -Requires: jre -Provides: servlet = 4 -Provides: servletapi4 +Requires: jre >= 1.3 +Provides: java(jsp) = 1.2 +Provides: java(servlet) = 2.3 Obsoletes: jakarta-servletapi BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description This subproject contains the compiled code for the implementation -classes of the Java Servlet and JSP APIs (packages javax.servlet, -javax.servlet.http, javax.servlet.jsp, and javax.servlet.jsp.tagext). +classes of the Java Servlet 2.3 and JSP 1.2 APIs (packages +javax.servlet, javax.servlet.http, javax.servlet.jsp, and +javax.servlet.jsp.tagext). %description -l pl.UTF-8 Ten podprojekt zawiera skompilowany kod klas zawierających -implementację standardów API Java Servlet i JSP (pakiety +implementację standardów API Java Servlet 2.3 i JSP 1.2 (pakiety javax.servlet, javax.servlet.http, javax.servlet.jsp, and javax.servlet.jsp.tagext). @@ -65,9 +66,11 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -cp -a dist/lib/servlet.jar $RPM_BUILD_ROOT%{_javadir}/servletapi-%{version}.jar -ln -s servletapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet.jar -ln -s servletapi-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servletapi4.jar +cp -a dist/lib/servlet.jar $RPM_BUILD_ROOT%{_javadir}/servlet-%{version}.jar +ln -s servlet-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-2.3.jar +ln -s servlet-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar +ln -s servlet-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-1.2.jar +ln -s servlet-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar # javadoc %if %{with javadoc} @@ -84,8 +87,12 @@ %files %defattr(644,root,root,755) -%doc BUILDING.txt LICENSE README.txt -%{_javadir}/*.jar +%doc LICENSE README.txt +%{_javadir}/servlet-%{version}.jar +%{_javadir}/servlet-api-2.3.jar +%{_javadir}/servlet-api.jar +%{_javadir}/jsp-api-1.2.jar +%{_javadir}/jsp-api.jar %if %{with javadoc} %files javadoc @@ -100,6 +107,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2011/02/12 12:49:47 qboosh +- symlinks and Provides cleanup (only versioned java(servlet) and java(jsp) left) +- dropped BUILDING.txt from binary package docs + Revision 1.36 2008/11/23 23:54:01 glen - rename to java-servletapi.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-servletapi/java-servletapi.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
