Hello community, here is the log from the commit of package servletapi5 for openSUSE:Factory checked in at 2013-08-25 13:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servletapi5 (Old) and /work/SRC/openSUSE:Factory/.servletapi5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "servletapi5" Changes: -------- --- /work/SRC/openSUSE:Factory/servletapi5/servletapi5.changes 2011-09-23 12:46:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servletapi5.new/servletapi5.changes 2013-08-25 13:32:41.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 23 11:38:55 UTC 2013 - [email protected] + +- drop javadoc package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servletapi5.spec ++++++ --- /var/tmp/diff_new_pack.jLcOJQ/_old 2013-08-25 13:32:42.000000000 +0200 +++ /var/tmp/diff_new_pack.jLcOJQ/_new 2013-08-25 13:32:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package servletapi5 (Version 5.0.18) +# spec file for package servletapi5 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: servletapi5 -BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap +BuildRequires: ant +BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: xml-commons-apis-bootstrap #!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis %define base_name servletapi @@ -30,7 +30,7 @@ %define release 1jpp %define section free Version: 5.0.18 -Release: 268 +Release: 0 Summary: Java servlet and JSP implementation classes License: Apache-2.0 Group: Development/Libraries/Java @@ -40,33 +40,14 @@ Requires: /usr/sbin/update-alternatives BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -#Obsoletes: servlet4 -#Obsoletes: servlet23 Provides: servlet -Provides: servlet5 Provides: servlet24 +Provides: servlet5 %description This subproject contains the source code for the implementation classes of the Java Servlet and JSP APIs (packages javax.servlet). - - -%package javadoc -License: Apache-2.0 -Group: Development/Libraries/Java -Summary: Javadoc for servletapi5 -PreReq: coreutils - -%description javadoc -This subproject contains the source code for the implementation classes -of the Java Servlet and JSP APIs (packages javax.servlet). - -This package contains the javadoc documentation for the Java Servlet -and JSP APIs. - - - %prep rm -rf $RPM_BUILD_ROOT %setup -q -c -T -a 0 -n %{full_name}-5-src @@ -79,11 +60,11 @@ find . -type f -name "*.jar" -exec rm -f {} \; pushd . cd jsr154 -ant dist -Dservletapi.build=build -Dservletapi.dist=dist +ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist popd pushd . cd jsr152 -ant dist -Dservletapi.build=build -Dservletapi.dist=dist +ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist popd %install @@ -93,44 +74,10 @@ install -m 644 jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar install -m 644 jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -# javadoc jsp -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/jsp-api-%{version} -cp -pr jsr152/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/jsp-api-%{version} -ln -s jsp-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jsp-api # ghost symlink -# javadoc servlet -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr jsr154/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -#update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/%{name}-%{version}.jar 50 -#update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/jsp-api-%{version}.jar 50 - -%postun -#if [ "$1" = "0" ]; then -# update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar -# update-alternatives --remove jsp %{_javadir}/jsp-api-%{version}.jar -#fi - -%post javadoc -rm -f %{_javadocdir}/%{name} -rm -f %{_javadocdir}/jsp-api -ln -s %{name}-%{version} %{_javadocdir}/%{name} -ln -s jsp-api-%{version} %{_javadocdir}/jsp-api %files %defattr(-,root,root) %doc LICENSE %{_javadir}/* -%files javadoc -%defattr(-,root,root) -%doc %{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/jsp-api-%{version} -%ghost %doc %{_javadocdir}/%{name} -%ghost %doc %{_javadocdir}/jsp-api - %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
