Author: pawelz Date: Mon Mar 16 00:18:37 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - versioned "P: servletapi" - unify javadocs - License version - rel 4
---- Files affected: SPECS: java-servletapi5.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/java-servletapi5.spec diff -u SPECS/java-servletapi5.spec:1.16 SPECS/java-servletapi5.spec:1.17 --- SPECS/java-servletapi5.spec:1.16 Sun Mar 15 20:28:06 2009 +++ SPECS/java-servletapi5.spec Mon Mar 16 01:18:31 2009 @@ -7,12 +7,14 @@ %bcond_with java_sun # use java-sun %include /usr/lib/rpm/macros.java + +%define srcname servletapi5 Summary: Java servlet and JSP implementation classes Summary(pl.UTF-8): Klasy z implementacją Java Servlet i JSP Name: java-servletapi5 Version: 5.5.27 -Release: 3 -License: Apache +Release: 4 +License: Apache v2 Group: Libraries/Java Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz # Source0-md5: eb3f196013550b9b1684e4ff18593a8e @@ -32,7 +34,7 @@ Provides: servlet = %{version} Provides: servlet24 Provides: servlet5 -Provides: servletapi +Provides: servletapi = 2.4 Provides: servletapi5 Obsoletes: classpathx_servlet Obsoletes: jakarta-servletapi < 4 @@ -97,16 +99,16 @@ # javadoc %if %{with javadoc} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a jsr152/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jsp-api -cp -a jsr154/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/servlet-api -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +cp -a jsr152/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}/jsp-api +cp -a jsr154/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}/servlet-api +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink %endif %clean rm -rf $RPM_BUILD_ROOT %post javadoc -ln -nfs %{name}-%{version} %{_javadocdir}/%{name} +ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname} %files %defattr(644,root,root,755) @@ -115,8 +117,8 @@ %if %{with javadoc} %files javadoc %defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{srcname}-%{version} +%ghost %{_javadocdir}/%{srcname} %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -125,6 +127,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2009/03/16 00:18:31 pawelz +- versioned "P: servletapi" +- unify javadocs +- License version +- rel 4 + Revision 1.16 2009/03/15 19:28:06 pawelz - it provides servletapi 2.4, not 5.5.27. - added with_java_sun bcond ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-servletapi5.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
