[jakarta-taglibs-standard] Adapt to current guidelines.

[Alexander Kurtakov]

commit 373222cc0c7328180cedc8a90e0f43cc594a2e55
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 19 14:03:30 2011 +0300

    Adapt to current guidelines.

 jakarta-taglibs-standard.spec |   73 +++++++---------------------------------
 1 files changed, 13 insertions(+), 60 deletions(-)
---
diff --git a/jakarta-taglibs-standard.spec b/jakarta-taglibs-standard.spec
index 4bc03ce..ee93963 100644
--- a/jakarta-taglibs-standard.spec
+++ b/jakarta-taglibs-standard.spec
@@ -28,16 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define base_name       standard
-%define short_name      taglibs-%{base_name}
+%global base_name       standard
+%global short_name      taglibs-%{base_name}
 
 Name:           jakarta-taglibs-standard
 Version:        1.1.1
-Release:        12.2%{?dist}
+Release:        12.3%{?dist}
 Epoch:          0
 Summary:        An open-source implementation of the JSP Standard Tag Library
 License:        ASL 2.0
@@ -45,26 +41,19 @@ Group:          Development/Libraries/Java
 URL:            http://jakarta.apache.org/taglibs/
 Source:         http://archive.apache.org/dist/jakarta/taglibs/standard/source/jakarta-taglibs-standard-1.1.1-src.tar.gz
 Patch0:         jakarta-taglibs-standard-%{version}-build.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRequires:  jpackage-utils >= 0:1.5.30
 BuildRequires:  ant
 BuildRequires:  servletapi5 >= 0:5.0.16
 BuildRequires:  tomcat5-jsp-2.0-api >= 0:5.0.16
+BuildRequires:  java-devel
+BuildRequires:  java-javadoc
 BuildRequires:  xalan-j2 >= 2.6.0
 Requires:       servletapi5 >= 0:5.0.16
 Requires:       tomcat5-jsp-2.0-api >= 0:5.0.16
 Requires:       xalan-j2 >= 2.6.0
 
-%if %{gcj_support}
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
 %description
 This package contains Jakarta Taglibs's open-source implementation of the 
 JSP Standard Tag Library (JSTL), version 1.1. JSTL is a standard under the
@@ -73,7 +62,6 @@ Java Community Process.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-BuildRequires:  java-javadoc
 
 %description    javadoc
 Javadoc for %{name}.
@@ -91,7 +79,6 @@ jaxp-api.jar=$(build-classpath xalan-j2)
 EOBP
 
 %build
-
 ant \
   -Dfinal.name=%{short_name} \
   -Dj2se.javadoc=%{_javadocdir}/java \
@@ -100,61 +87,28 @@ ant \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p standard/dist/standard/lib/jstl.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-taglibs-core-%{version}.jar
-cp -p standard/dist/standard/lib/standard.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-taglibs-standard-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+cp -p standard/dist/standard/lib/jstl.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-taglibs-core.jar
+cp -p standard/dist/standard/lib/standard.jar $RPM_BUILD_ROOT%{_javadir}/jakarta-taglibs-standard.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%defattr(0644,root,root,0755)
 %doc standard/README_src.txt standard/README_bin.txt standard/dist/doc/doc/standard-doc/*.html
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-taglibs-core-1.1.1.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-taglibs-standard-1.1.1.jar.*
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Jul 19 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.1-12.3
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.1-12.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -227,4 +181,3 @@ fi
 * Mon Dec 22 2003 Kaj J. Niemi <kajtzu at fi.basen.net> - 0:1.1.0-0.B1.1
 - First build
 - Skip examples for now
-