OBS User unknown
2008-08-25 23:56:39 +00:00
committed by Git OBS Bridge
parent 616cc004c5
commit 80849280e4
21 changed files with 50 additions and 396 deletions

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -19,7 +19,7 @@
</target>
<target name="build" depends="init">
<javac srcdir="${src}" destdir="${build}"/>
<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
<target name="clean" description="clean up" >

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 25 11:47:57 CEST 2008 - mvyskocil@suse.cz
- target=1.5 source=1.5
- removed a gcj support
- fixed some rpmlint warnings
-------------------------------------------------------------------
Tue Apr 22 00:53:09 CEST 2008 - ro@suse.de

View File

@@ -2,15 +2,21 @@
# spec file for package geronimo-specs (Version 1.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%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 without_tests %{?_without_tests:1}%{!?_without_tests:0}
%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
# build withouth maven
@@ -20,7 +26,7 @@
Name: geronimo-specs
Version: 1.1
Release: 9
Release: 91
Summary: Geronimo J2EE server J2EE specifications
Url: http://geronimo.apache.org
Source0: %{name}-%{version}-src.tar.bz2
@@ -113,15 +119,7 @@ Requires: geronimo-jta-1_0_1B-api = %{version}-%{release}
Requires: geronimo-qname-1_1-api = %{version}-%{release}
Requires: geronimo-saaj-1_1-api = %{version}-%{release}
Requires: geronimo-servlet-2_4-api = %{version}-%{release}
%if %{gcj_support}
BuildRequires: gnu-crypto
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -478,6 +476,16 @@ cp %{SOURCE18} geronimo-spec-qname/build.xml
cp %{SOURCE19} geronimo-spec-saaj/build.xml
cp %{SOURCE20} geronimo-spec-servlet/build.xml
%endif
# wrong end of line encoding
sed -i -e 's/.$//' geronimo-spec-jaxr/LICENSE.txt \
geronimo-spec-jaxrpc/LICENSE.txt \
geronimo-spec-corba-3.0/LICENSE.txt \
geronimo-spec-corba-3.0/LICENSE.txt \
geronimo-spec-corba-2.3/LICENSE.txt \
geronimo-spec-j2ee-connector/LICENSE.txt \
geronimo-spec-j2ee-jacc/LICENSE.txt \
geronimo-qname-1_1-api/LICENSE.txt \
geronimo-saaj-1_1-api/LICENSE.txt
%build
[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
@@ -606,9 +614,6 @@ popd
%endif
%install
%if ! %defined suse_version
rm -rf $RPM_BUILD_ROOT
%endif
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
# Directory for poms
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -889,12 +894,6 @@ cp -pr geronimo-spec-j2ee-jacc/target/site/apidocs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jacc
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
%endif
%if %{gcj_support}
mv $RPM_BUILD_ROOT%{_javadir}/geronimo-j2ee-1.4-apis-%{version}.jar .
export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
mv geronimo-j2ee-1.4-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/geronimo-j2ee-1.4-apis-%{version}.jar
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -913,88 +912,11 @@ ln -s %{_sysconfdir}/alternatives/jaf %{_javadir}/jaf.jar
%post -n geronimo-jaf-1_0_2-api
/usr/sbin/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jaf-1_0_2-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jaf-1_0_2-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%post -n geronimo-commonj-1_1-apis
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%postun -n geronimo-commonj-1_1-apis
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%post -n geronimo-corba-1_0-apis
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%postun -n geronimo-corba-1_0-apis
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%post -n geronimo-corba-2_3-apis
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{gcj_support}
%postun -n geronimo-corba-2_3-apis
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
#%if %{gcj_support}
#%post -n geronimo-corba-3.0-apis
#if [ -x %{_bindir}/rebuild-gcj-db ]
#then
# %{_bindir}/rebuild-gcj-db
#fi
#%endif
#
#%if %{gcj_support}
#%postun -n geronimo-corba-3.0-apis
#if [ -x %{_bindir}/rebuild-gcj-db ]
#then
# %{_bindir}/rebuild-gcj-db
#fi
#%endif
%triggerpostun -n geronimo-ejb-2_1-api -- ejb <= 2.1-3jpp_2rh
# Remove file from old non-free packages
@@ -1004,25 +926,11 @@ ln -s %{_sysconfdir}/alternatives/ejb %{_javadir}/ejb.jar
%post -n geronimo-ejb-2_1-api
/usr/sbin/update-alternatives --install %{_javadir}/ejb.jar ejb %{_javadir}/geronimo-ejb-2.1-api.jar 20100
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-ejb-2_1-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove ejb %{_javadir}/geronimo-ejb-2.1-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-ejb-2_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-j2ee-connector-1_5-api -- j2ee-connector <= 1.5-3jpp_2rh
# Remove file from old non-free packages
@@ -1032,25 +940,11 @@ ln -s %{_sysconfdir}/alternatives/j2ee-connector %{_javadir}/j2ee-connector.jar
%post -n geronimo-j2ee-connector-1_5-api
/usr/sbin/update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-j2ee-connector-1_5-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-j2ee-connector-1_5-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-j2ee-deployment-1_1-api -- j2ee-deployment <= 1.1-1jpp_1rh
# Remove file from old non-free packages
@@ -1060,25 +954,11 @@ ln -s %{_sysconfdir}/alternatives/j2ee-deployment %{_javadir}/j2ee-deployment.ja
%post -n geronimo-j2ee-deployment-1_1-api
/usr/sbin/update-alternatives --install %{_javadir}/j2ee-deployment.jar j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-j2ee-deployment-1_1-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-j2ee-deployment-1_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-jacc-1_0-api -- jacc <= 1.0-1jpp
# Remove file from old non-free packages
@@ -1088,25 +968,11 @@ ln -s %{_sysconfdir}/alternatives/jacc %{_javadir}/jacc.jar
%post -n geronimo-jacc-1_0-api
/usr/sbin/update-alternatives --install %{_javadir}/jacc.jar jacc %{_javadir}/geronimo-jacc-1.0-api.jar 10000
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jacc-1_0-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jacc %{_javadir}/geronimo-jacc-1.0-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jacc-1_0-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-j2ee-management-1_0-api -- j2ee-management <= 1.0-1jpp_1rh
# Remove file from old non-free packages
@@ -1116,50 +982,20 @@ ln -s %{_sysconfdir}/alternatives/j2ee-management %{_javadir}/j2ee-management.ja
%post -n geronimo-j2ee-management-1_0-api
/usr/sbin/update-alternatives --install %{_javadir}/j2ee-management.jar j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-j2ee-management-1_0-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-j2ee-management-1_0-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
# Do not provide it as this is just the API (is it?) and
# our 'javamail' alternative means the providers as well
# all in a single jar file called 'javamail.jar'
%if %{gcj_support}
%post -n geronimo-javamail-1_3_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
#/usr/sbin/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301
#
#%preun -n geronimo-javamail-1.3.1-api
#if [ "$1" = "0" ]; then
# /usr/sbin/update-alternatives --remove javamail %{_javadir}/geronimo-javamail-1.3.1-api.jar
#fi
%if %{gcj_support}
%postun -n geronimo-javamail-1_3_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-jaxr-1_0-api -- jaxr-api <= 1.0-1jpp
# Remove file from old non-free packages
@@ -1169,47 +1005,19 @@ ln -s %{_sysconfdir}/alternatives/jaxr %{_javadir}/jaxr.jar
%post -n geronimo-jaxr-1_0-api
/usr/sbin/update-alternatives --install %{_javadir}/jaxr.jar jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar 10000
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jaxr-1_0-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jaxr-1_0-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%post -n geronimo-jaxrpc-1_1-api
/usr/sbin/update-alternatives --install %{_javadir}/jaxrpc.jar jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jaxrpc-1_1-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jaxrpc-1_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-jms-1_1-api -- jms <= 1.1-3jpp_2rh
# Remove file from old non-free packages
@@ -1219,47 +1027,19 @@ ln -s %{_sysconfdir}/alternatives/jms %{_javadir}/jms.jar
%post -n geronimo-jms-1_1-api
/usr/sbin/update-alternatives --install %{_javadir}/jms.jar jms %{_javadir}/geronimo-jms-1.1-api.jar 10100
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jms-1_1-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jms-1_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%post -n geronimo-jsp-2_0-api
/usr/sbin/update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/geronimo-jsp-2.0-api.jar 20000
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jsp-2_0-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.0-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jsp-2_0-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%triggerpostun -n geronimo-jta-1_0_1B-api -- jta <= 1.0.1-0.b.3jpp_2rh
# Remove file from old non-free packages
@@ -1269,98 +1049,41 @@ ln -s %{_sysconfdir}/alternatives/jta %{_javadir}/jta.jar
%post -n geronimo-jta-1_0_1B-api
/usr/sbin/update-alternatives --install %{_javadir}/jta.jar jta %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-jta-1_0_1B-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove jta %{_javadir}/geronimo-jta-1.0.1B-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-jta-1_0_1B-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%post -n geronimo-qname-1_1-api
/usr/sbin/update-alternatives --install %{_javadir}/qname.jar qname %{_javadir}/geronimo-qname-1.1-api.jar 10100
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%postun -n geronimo-qname-1_1-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove qname %{_javadir}/geronimo-qname-1.1-api.jar
fi
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%post -n geronimo-saaj-1_1-api
/usr/sbin/update-alternatives --install %{_javadir}/saaj.jar saaj %{_javadir}/geronimo-saaj-1.1-api.jar 10100
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-saaj-1_1-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove saaj %{_javadir}/geronimo-saaj-1.1-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-saaj-1_1-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%post -n geronimo-servlet-2_4-api
/usr/sbin/update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/geronimo-servlet-2.4-api.jar 20400
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%preun -n geronimo-servlet-2_4-api
if [ "$1" = "0" ]; then
/usr/sbin/update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.4-api.jar
fi
%if %{gcj_support}
%postun -n geronimo-servlet-2_4-api
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(-,root,root,-)
%doc etc/LICENSE.txt
%dir %{_javadir}/geronimo
%{_javadir}/geronimo/*
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%endif
%if %{with_maven}
%files javadoc
@@ -1378,105 +1101,61 @@ fi
%defattr(-,root,root,-)
%{_javadir}/geronimo-commonj-1.1-apis*.jar
%doc geronimo-spec-commonj/LICENSE.txt
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-commonj-1.1-apis-%{version}.jar.*
%endif
%files -n geronimo-jaf-1_0_2-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jaf-1.0.2-api*.jar
%doc geronimo-spec-activation/LICENSE.txt
%ghost %{_javadir}/jaf.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jaf-1.0.2-api-%{version}.jar.*
%endif
%files -n geronimo-corba-1_0-apis
%defattr(-,root,root,-)
%{_javadir}/geronimo-corba-1.0-apis*.jar
#%doc geronimo-spec-corba/LICENSE.txt
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-corba-1.0-apis-%{version}.jar.*
%endif
%files -n geronimo-corba-2_3-apis
%defattr(-,root,root,-)
%{_javadir}/geronimo-corba-2.3-apis*.jar
%doc geronimo-spec-corba-2.3/LICENSE.txt
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-corba-2.3-apis-%{version}.jar.*
%endif
#%files -n geronimo-corba-3.0-apis
#%defattr(-,root,root,-)
#%{_javadir}/geronimo-corba-3.0-apis*.jar
#%doc geronimo-spec-corba-3.0/LICENSE.txt
#%if %{gcj_support}
#%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
#%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-corba-3.0-apis-%{version}.jar.*
#%endif
%files -n geronimo-ejb-2_1-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-ejb-2.1-api*.jar
%doc geronimo-spec-ejb/LICENSE.txt
%ghost %{_javadir}/ejb.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-ejb-2.1-api-%{version}.jar.*
%endif
%files -n geronimo-j2ee-1_4-apis
%defattr(-,root,root,-)
%{_javadir}/geronimo-j2ee-1.4-apis*.jar
%doc geronimo-spec-j2ee/LICENSE.txt
#%if %{gcj_support}
#%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
#%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-1.4-apis-%{version}.jar.*
#%endif
%files -n geronimo-j2ee-connector-1_5-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-j2ee-connector-1.5-api*.jar
%doc geronimo-spec-j2ee-connector/LICENSE.txt
%ghost %{_javadir}/j2ee-connector.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-connector-1.5-api-%{version}.jar.*
%endif
%files -n geronimo-j2ee-deployment-1_1-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-j2ee-deployment-1.1-api*.jar
%doc geronimo-spec-j2ee-deployment/LICENSE.txt
%ghost %{_javadir}/j2ee-deployment.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-deployment-1.1-api-%{version}.jar.*
%endif
%files -n geronimo-jacc-1_0-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jacc-1.0-api*.jar
%doc geronimo-spec-j2ee-jacc/LICENSE.txt
%ghost %{_javadir}/jacc.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jacc-1.0-api-%{version}.jar.*
%endif
%files -n geronimo-j2ee-management-1_0-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-j2ee-management-1.0-api*.jar
%doc geronimo-spec-j2ee-management/LICENSE.txt
%ghost %{_javadir}/j2ee-management.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-j2ee-management-1.0-api-%{version}.jar.*
%endif
%files -n geronimo-javamail-1_3_1-api
%defattr(-,root,root,-)
@@ -1486,92 +1165,60 @@ fi
# our 'javamail' alternative means the providers as well
# all in a single jar file called 'javamail.jar'
#%ghost %{_javadir}/javamail.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-javamail-1.3.1-api-%{version}.jar.*
%endif
%files -n geronimo-jaxr-1_0-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jaxr-1.0-api*.jar
%doc geronimo-spec-jaxr/LICENSE.txt
%ghost %{_javadir}/jaxr.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jaxr-1.0-api-%{version}.jar.*
%endif
%files -n geronimo-jaxrpc-1_1-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jaxrpc-1.1-api*.jar
%doc geronimo-spec-jaxrpc/LICENSE.txt
%ghost %{_javadir}/jaxrpc.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jaxrpc-1.1-api-%{version}.jar.*
%endif
%files -n geronimo-jms-1_1-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jms-1.1-api*.jar
%doc geronimo-spec-jms/LICENSE.txt
%ghost %{_javadir}/jms.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jms-1.1-api-%{version}.jar.*
%endif
%files -n geronimo-jsp-2_0-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jsp-2.0-api*.jar
%doc geronimo-spec-jsp/LICENSE.txt
%ghost %{_javadir}/jsp.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jsp-2.0-api-%{version}.jar.*
%endif
%files -n geronimo-jta-1_0_1B-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-jta-1.0.1B-api*.jar
%doc geronimo-spec-jta/LICENSE.txt
%ghost %{_javadir}/jta.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-jta-1.0.1B-api-%{version}.jar.*
%endif
%files -n geronimo-qname-1_1-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-qname-1.1-api*.jar
%doc geronimo-spec-qname/LICENSE.txt
%ghost %{_javadir}/qname.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-qname-1.1-api-%{version}.jar.*
%endif
%files -n geronimo-saaj-1_1-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-saaj-1.1-api*.jar
%doc geronimo-spec-saaj/LICENSE.txt
%ghost %{_javadir}/saaj.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-saaj-1.1-api-%{version}.jar.*
%endif
%files -n geronimo-servlet-2_4-api
%defattr(-,root,root,-)
%{_javadir}/geronimo-servlet-2.4-api*.jar
%doc geronimo-spec-servlet/LICENSE.txt
%ghost %{_javadir}/servlet.jar
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-servlet-2.4-api-%{version}.jar.*
%endif
%changelog
* Mon Aug 25 2008 mvyskocil@suse.cz
- target=1.5 source=1.5
- removed a gcj support
- fixed some rpmlint warnings
* Tue Apr 22 2008 ro@suse.de
- changed requires of main package to use underscores as well
* Thu Apr 17 2008 mvyskocil@suse.cz