- Cleanup with spec-cleaner.

- Fix update-alternatives code

OBS-URL: https://build.opensuse.org/package/show/Java:packages/servletapi5?expand=0&rev=7

servletapi5.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 21 10:38:49 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner.
+- Fix update-alternatives code
+
 -------------------------------------------------------------------
 Fri Aug 23 11:38:55 UTC 2013 - mvyskocil@suse.com
 

servletapi5.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package servletapi5
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -16,40 +16,34 @@
 #
 
 
-Name:           servletapi5
-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
-%define	major_version	5
-%define	name		%{base_name}%{major_version}
 %define full_name	jakarta-%{base_name}
-%define	version		5.0.18
+Name:           servletapi5
-%define release		1jpp
-%define section		free
 Version:        5.0.18
 Release:        0
 Summary:        Java servlet and JSP implementation classes
 License:        Apache-2.0
 Group:          Development/Libraries/Java
+Url:            http://jakarta.apache.org/tomcat/
 Source:         %{full_name}-5-src.tar.gz
 Patch150:       java150_build.patch
-Url:            http://jakarta.apache.org/tomcat/
+#!BuildIgnore:  xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
-Requires:       /usr/sbin/update-alternatives
+#!BuildIgnore:  xml-commons-jaxp-1.3-apis
-BuildArch:      noarch
+BuildRequires:  ant
+BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  xml-commons-apis-bootstrap
+Requires(post): update-alternatives
+Provides:       servlet = %{version}
+Provides:       servlet24 = %{version}
+Provides:       servlet5 = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Provides:       servlet
+BuildArch:      noarch
-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).
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -c -T -a 0 -n %{full_name}-5-src
 %patch150
 
@@ -70,14 +64,28 @@ popd
 %install
 cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar
+install -m 644 jsr152/dist/lib/jsp-api.jar %{buildroot}%{_javadir}/jspapi-%{version}.jar
-install -m 644 jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 jsr154/dist/lib/servlet-api.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+# alternatives
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
+ln -s %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_sysconfdir}/alternatives/servlet.jar
+ln -s %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
+
+%post
+update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/%{name}-%{version}.jar 50
+
+%postun
+if [ "$1" = "0" ]; then
+    update-alternatives --remove servlet %{_javadir}/%{name}-%{version}.jar
+fi
 
 %files
 %defattr(-,root,root)
 %doc LICENSE
 %{_javadir}/*
+%{_javadir}/servlet.jar
+%ghost %{_sysconfdir}/alternatives/servlet.jar
 
 %changelog