- Cleanup bit with spec-cleaner.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jakarta-taglibs-standard?expand=0&rev=6
This commit is contained in:
Tomáš Chvátal 2014-07-11 09:14:32 +00:00 committed by Git OBS Bridge
parent cc15d17179
commit 5fccf81100
2 changed files with 15 additions and 20 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 11 09:14:05 UTC 2014 - tchvatal@suse.com
- Cleanup bit with spec-cleaner.
-------------------------------------------------------------------
Wed Jun 13 07:13:56 UTC 2012 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package jakarta-taglibs-standard
#
# Copyright (c) 2012 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
@ -17,7 +17,6 @@
%define short_name taglibs-standard
Name: jakarta-taglibs-standard
Version: 1.1.1
Release: 0
@ -30,15 +29,14 @@ Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-java6-compatibility.patch
Patch2: %{name}-%{version}-remove-enums.patch
Patch3: jakarta-taglibs-standard-java7.patch
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: servletapi5
BuildRequires: xalan-j2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: servletapi5 >= 5.0.16
Requires: xalan-j2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
This package contains releases for the 1.1.x versions of the Standard
@ -46,18 +44,13 @@ Tag Library, Jakarta Taglibs's open source implementation of the JSP
Standard Tag Library (JSTL), version 1.1. JSTL is a standard under the
Java Community Process.
%package javadoc
PreReq: coreutils
Summary: Javadoc for jakarta-taglibs-standard
Group: Development/Libraries/Java
%description javadoc
This package contains the javadoc documentation for Jakarta Taglibs.
%prep
%setup -q -n %{name}-%{version}-src
%patch0
@ -82,17 +75,14 @@ ant \
%install
# 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)
mkdir -p %{buildroot}%{_javadir}
cp -p standard/dist/standard/lib/jstl.jar %{buildroot}%{_javadir}/jakarta-taglibs-core-%{version}.jar
cp -p standard/dist/standard/lib/standard.jar %{buildroot}%{_javadir}/jakarta-taglibs-standard-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr standard/dist/standard/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr standard/dist/standard/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)