|
|
@@ -8,7 +8,6 @@
|
|
|
|
|
|
# resolve circular dependency between sinjdoc and java-1.5.0-gcj.
|
|
|
# define to 1 if sinjdoc has not been built yet.
|
|
|
-##VINE##define bootstrap 0
|
|
|
%define bootstrap 1
|
|
|
|
|
|
# the plugin subpackage is disabled because libgcj's security
|
|
|
@@ -18,7 +17,7 @@
|
|
|
# the naming suffix for the gcc rpms we require (e.g., gcc4, libgcj4)
|
|
|
%define gccsuffix %{nil}
|
|
|
# the version-release string for the gcj rpms we require
|
|
|
-%define gccver 4.1.2-5
|
|
|
+%define gccver 4.4.3-9
|
|
|
# the version string for the java-gcj-compat release we require
|
|
|
%define jgcver 1.0.79
|
|
|
|
|
|
@@ -55,9 +54,9 @@
|
|
|
%define debug_package %{nil}
|
|
|
|
|
|
Name: %{name}
|
|
|
-Version: %{javaver}.%{buildver}
|
|
|
-Release: 35%{?_dist_release}
|
|
|
Summary: JPackage runtime compatibility layer for GCJ
|
|
|
+Version: %{javaver}.%{buildver}
|
|
|
+Release: 36%{?_dist_release}
|
|
|
Group: Development/Languages
|
|
|
# The LICENSE file has the classpath exception, but nothing in this package
|
|
|
# seems to use or even need it.
|
|
|
@@ -80,7 +79,7 @@ BuildRequires: openssl
|
|
|
BuildRequires: openssl-devel
|
|
|
%endif
|
|
|
BuildRequires: python-devel
|
|
|
-%if ! %{bootstrap}
|
|
|
+%if !%{bootstrap}
|
|
|
# required for javadoc
|
|
|
BuildRequires: java-1.6.0-openjdk-devel
|
|
|
%endif
|
|
|
@@ -89,44 +88,30 @@ BuildRequires: unzip
|
|
|
BuildRequires: jpackage-utils >= 1.7.5-1vl6
|
|
|
|
|
|
# required for tools and libgcj.jar
|
|
|
-Requires: libgcj%{gccsuffix} >= %{gccver}
|
|
|
+Requires: libgcj%{gccsuffix} >= %{gccver}
|
|
|
# required for directory structures
|
|
|
-Requires: jpackage-utils >= 1.7.5-1
|
|
|
+Requires: jpackage-utils >= 1.7.5-1
|
|
|
# required for java.security symlink. also ensures that the proper
|
|
|
# libgcj is installed on multilib systems.
|
|
|
-Requires: %{syslibdir}/security/classpath.security
|
|
|
-%if ! %{bootstrap}
|
|
|
+#Requires: %{syslibdir}/security/classpath.security
|
|
|
+%if !%{bootstrap}
|
|
|
# required for javadoc symlink
|
|
|
Requires: sinjdoc
|
|
|
%endif
|
|
|
|
|
|
# post requires alternatives to install tool alternatives
|
|
|
Requires(post): alternatives
|
|
|
-# post requires gij to retrieve gcc version
|
|
|
-#Requires(post): %{_bindir}/gij%{gccsuffix}
|
|
|
-Requires(post): libgcj
|
|
|
-# post rebuilds the gcj database
|
|
|
-Requires(post): %{_bindir}/rebuild-gcj-db
|
|
|
-# rebuild-gcj-db requires gcj-dbtool
|
|
|
-#Requires(post): %{_bindir}/gcj-dbtool%{gccsuffix}
|
|
|
-# rebuild-gcj-db requires findutils
|
|
|
+# rebuild-gcj-db requires gcj-dbtool, findutils
|
|
|
+Requires(post): libgcj%{gccsuffix}
|
|
|
Requires(post): findutils
|
|
|
# postun requires alternatives to uninstall tool alternatives
|
|
|
Requires(postun): alternatives
|
|
|
-# postun requires gij to retrieve gcc version
|
|
|
-#Requires(postun): %{_bindir}/gij%{gccsuffix}
|
|
|
-Requires(postun): libgcj
|
|
|
-# postun rebuilds the gcj database
|
|
|
-Requires(postun): %{_bindir}/rebuild-gcj-db
|
|
|
-# rebuild-gcj-db requires gcj-dbtool
|
|
|
-#Requires(postun): %{_bindir}/gcj-dbtool%{gccsuffix}
|
|
|
-# rebuild-gcj-db requires findutils
|
|
|
+# rebuild-gcj-db requires gcj-dbtool, findutils
|
|
|
+Requires(postun): libgcj%{gccsuffix}
|
|
|
Requires(postun): findutils
|
|
|
# triggerin requires alternatives to install tool alternatives
|
|
|
Requires(triggerin): alternatives
|
|
|
-# triggerin requires gij to retrieve gcc version
|
|
|
-#Requires(triggerin): %{_bindir}/gij%{gccsuffix}
|
|
|
-Requires(triggerin): libgcj
|
|
|
+Requires(triggerin): libgcj%{gccsuffix}
|
|
|
# triggerin requires jpackage-utils for abs2rel
|
|
|
Requires(triggerin): jpackage-utils >= 1.7.5-1
|
|
|
|
|
|
@@ -173,7 +158,6 @@ Requires: libgcj%{gccsuffix}-src >= %{gccver}
|
|
|
# require base package
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
# require eclipse-ecj for ecj binary
|
|
|
-##VINE##Requires: eclipse-ecj >= 3.2.1
|
|
|
Requires: ecj >= 3.2.1
|
|
|
# require python for aot-compile
|
|
|
Requires: python
|
|
|
@@ -182,15 +166,12 @@ Requires: gcc%{gccsuffix}-java >= %{gccver}
|
|
|
# post requires alternatives to install tool alternatives
|
|
|
Requires(post): alternatives
|
|
|
# post requires gcj to retrieve gcj header file locations
|
|
|
-#Requires(post): %{_bindir}/gcj%{gccsuffix}
|
|
|
Requires(post): gcc-java
|
|
|
# postun requires alternatives to uninstall tool alternatives
|
|
|
Requires(postun): alternatives
|
|
|
# triggerin requires gij to retrieve gcc version
|
|
|
-#Requires(triggerin): %{_bindir}/gij%{gccsuffix}
|
|
|
-Requires(triggerin): libgcj
|
|
|
+Requires(triggerin): libgcj%{gccsuffix}
|
|
|
# triggerin requires gcj to retrieve gcj header file locations
|
|
|
-#Requires(triggerin): %{_bindir}/gcj%{gccsuffix}
|
|
|
Requires(triggerin): gcc-java
|
|
|
# triggerin requires jpackage-utils for abs2rel
|
|
|
Requires(triggerin): jpackage-utils >= 1.7.5-1
|
|
|
@@ -216,16 +197,13 @@ GCJ.
|
|
|
|
|
|
%package src
|
|
|
Summary: Source files for libgcj
|
|
|
+Summary: libgcj のソースファイル
|
|
|
Group: Development/Libraries
|
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: libgcj%{gccsuffix}-src >= %{gccver}
|
|
|
-# post requires gij to retrieve gcc version
|
|
|
-#Requires(post): %{_bindir}/gij%{gccsuffix}
|
|
|
-Requires(post): libgcj
|
|
|
-# triggerin requires gij to retrieve gcc version
|
|
|
-#Requires(triggerin): %{_bindir}/gij%{gccsuffix}
|
|
|
-Requires(triggerin): libgcj
|
|
|
+Requires(post): libgcj%{gccsuffix}
|
|
|
+Requires(triggerin): libgcj%{gccsuffix}
|
|
|
# triggerin requires jpackage-utils for abs2rel
|
|
|
Requires(triggerin): jpackage-utils >= 1.7.5-1
|
|
|
|
|
|
@@ -238,14 +216,20 @@ Obsoletes: java-1.4.2-gcj-compat-src <= 1.4.2.0-40jpp.111
|
|
|
This package installs a src.zip symbolic link that points to a
|
|
|
specific version of the libgcj sources.
|
|
|
|
|
|
-%if ! %{bootstrap}
|
|
|
+%if !%{bootstrap}
|
|
|
%package javadoc
|
|
|
Summary: API documentation for libgcj
|
|
|
-Group: Development/Documentation
|
|
|
+Summary(ja): libgcj の API ドキュメント
|
|
|
+Group: Documentation
|
|
|
|
|
|
# require base package
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
+# Post requires alternatives to install javadoc alternative.
|
|
|
+Requires(post): alternatives
|
|
|
+# Postun requires alternatives to uninstall javadoc alternative.
|
|
|
+Requires(postun): alternatives
|
|
|
+
|
|
|
# standard JPackage javadoc provides
|
|
|
Provides: java-javadoc = %{version}-%{release}
|
|
|
Provides: java-%{javaver}-javadoc = %{version}-%{release}
|
|
|
@@ -380,12 +364,12 @@ popd
|
|
|
# classmap database directory
|
|
|
install -dm 755 $RPM_BUILD_ROOT%{syslibdir}/gcj
|
|
|
|
|
|
-%if ! %{bootstrap}
|
|
|
+%if !%{bootstrap}
|
|
|
# build and install API documentation
|
|
|
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|
|
-pushd $RPM_BUILD_ROOT%{_javadocdir}
|
|
|
- ln -s %{name} java
|
|
|
-popd
|
|
|
+#pushd $RPM_BUILD_ROOT%{_javadocdir}
|
|
|
+# ln -s %{name} java
|
|
|
+#popd
|
|
|
mkdir docsbuild
|
|
|
pushd docsbuild
|
|
|
GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
@@ -485,14 +469,27 @@ GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
/sbin/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
|
|
|
jaxp_parser_impl %{_javadir}/libgcj-$GIJ_VERSION.jar 20
|
|
|
|
|
|
+# fix broken symlink if it's there
|
|
|
+if [ ! -f %{_bindir}/java ] ; then
|
|
|
+ /sbin/update-alternatives --auto java
|
|
|
+ /sbin/update-alternatives --auto jre_%{origin}
|
|
|
+ /sbin/update-alternatives --auto jre_%{javaver}
|
|
|
+fi
|
|
|
+if [ ! -f %{_javadir}/jaxp_parser_impl.jar ] ; then
|
|
|
+ /sbin/update-alternatives --auto jaxp_parser_impl
|
|
|
+fi
|
|
|
+
|
|
|
{
|
|
|
+ GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
+ | awk '{ print $5 }')
|
|
|
+
|
|
|
# Rebuild the list of security providers in classpath.security.
|
|
|
# This used to be a standalone script, rebuild-security-providers,
|
|
|
# provided by the Fedora version of jpackage-utils. Now it is
|
|
|
# inlined here and removed from Fedora's jpackage-utils for
|
|
|
# compatibility with jpackage.org's jpackage-utils. See:
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=260161
|
|
|
- suffix=security/classpath.security
|
|
|
+ suffix=security/classpath.security-$GIJ_VERSION
|
|
|
secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
|
|
|
|
|
|
for secfile in $secfiles
|
|
|
@@ -511,8 +508,7 @@ GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
done
|
|
|
} || :
|
|
|
|
|
|
-if [ -x %{_bindir}/rebuild-gcj-db ]
|
|
|
-then
|
|
|
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
|
|
|
%{_bindir}/rebuild-gcj-db
|
|
|
fi
|
|
|
|
|
|
@@ -550,20 +546,26 @@ fi
|
|
|
} || :
|
|
|
|
|
|
%postun
|
|
|
-if [ $1 -eq 0 ]
|
|
|
-then
|
|
|
- GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
- | awk '{ print $5 }')
|
|
|
- /sbin/update-alternatives --remove java %{jrebindir}/java
|
|
|
- /sbin/update-alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
|
|
|
- /sbin/update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
|
|
|
- /sbin/update-alternatives --remove jaxp_parser_impl \
|
|
|
- %{_javadir}/libgcj-$GIJ_VERSION.jar
|
|
|
+if [ $1 -eq 0 ]; then
|
|
|
+ GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
+ | awk '{ print $5 }')
|
|
|
+ /sbin/update-alternatives --remove java %{jrebindir}/java
|
|
|
+ /sbin/update-alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
|
|
|
+ /sbin/update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
|
|
|
+ /sbin/update-alternatives --remove jaxp_parser_impl \
|
|
|
+ %{_javadir}/libgcj-$GIJ_VERSION.jar
|
|
|
+ /sbin/update-alternatives --auto java
|
|
|
+ /sbin/update-alternatives --auto jre_%{origin}
|
|
|
+ /sbin/update-alternatives --auto jre_%{javaver}
|
|
|
+ /sbin/update-alternatives --auto jaxp_parser_impl
|
|
|
fi
|
|
|
|
|
|
{
|
|
|
+ GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
|
|
|
+ | awk '{ print $5 }')
|
|
|
+
|
|
|
# Rebuild the list of security providers in classpath.security
|
|
|
- suffix=security/classpath.security
|
|
|
+ suffix=security/classpath.security-$GIJ_VERSION
|
|
|
secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
|
|
|
|
|
|
for secfile in $secfiles
|
|
|
@@ -582,8 +584,7 @@ fi
|
|
|
done
|
|
|
} || :
|
|
|
|
|
|
-if [ -x %{_bindir}/rebuild-gcj-db ]
|
|
|
-then
|
|
|
+if [ -x %{_bindir}/rebuild-gcj-db ]; then
|
|
|
%{_bindir}/rebuild-gcj-db
|
|
|
fi
|
|
|
|
|
|
@@ -611,6 +612,13 @@ fi
|
|
|
--slave %{_jvmjardir}/java-%{javaver} \
|
|
|
java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
|
|
|
|
|
|
+# fix broken symlink if it's there
|
|
|
+if [ ! -f %{_bindir}/javac ] ; then
|
|
|
+ /sbin/update-alternatives --auto javac
|
|
|
+ /sbin/update-alternatives --auto java_sdk_%{origin}
|
|
|
+ /sbin/update-alternatives --auto java_sdk_%{javaver}
|
|
|
+fi
|
|
|
+
|
|
|
# gcc-java requires libgcj-devel which provides jni.h
|
|
|
%triggerin devel -- gcc%{gccsuffix}-java >= %{gccver}
|
|
|
{
|
|
|
@@ -648,6 +656,9 @@ then
|
|
|
/sbin/update-alternatives --remove javac %{sdkbindir}/javac
|
|
|
/sbin/update-alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
|
|
|
/sbin/update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
|
|
|
+ /sbin/update-alternatives --auto javac
|
|
|
+ /sbin/update-alternatives --auto java_sdk_%{origin}
|
|
|
+ /sbin/update-alternatives --auto java_sdk_%{javaver}
|
|
|
fi
|
|
|
|
|
|
%triggerin src -- libgcj%{gccsuffix}-src >= %{gccver}
|
|
|
@@ -660,6 +671,24 @@ fi
|
|
|
%{_jvmdir}/%{sdkdir}/src.zip
|
|
|
} || :
|
|
|
|
|
|
+
|
|
|
+%if !%{bootstrap}
|
|
|
+%post javadoc
|
|
|
+/sbin/update-alternatives \
|
|
|
+ --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name} %{priority}
|
|
|
+
|
|
|
+# fix broken symlink if it's there
|
|
|
+if [ ! -f %{_javadocdir}/java ] ; then
|
|
|
+ /sbin/update-alternatives --auto javadocdir
|
|
|
+fi
|
|
|
+
|
|
|
+%postun javadoc
|
|
|
+if [ $1 -eq 0 ]; then
|
|
|
+ /sbin/update-alternatives --remove javadocdir %{_javadocdir}/%{name}
|
|
|
+ /sbin/update-alternatives --auto javadocdir
|
|
|
+fi
|
|
|
+%endif
|
|
|
+
|
|
|
%if %{enable_plugin}
|
|
|
%triggerin plugin -- libgcj%{gccsuffix} >= %{gccver}
|
|
|
{
|
|
|
@@ -791,7 +820,7 @@ fi
|
|
|
%defattr(-,root,root,-)
|
|
|
%ghost %{_jvmdir}/%{sdkdir}/src.zip
|
|
|
|
|
|
-%if ! %{bootstrap}
|
|
|
+%if !%{bootstrap}
|
|
|
%files javadoc
|
|
|
%defattr(-,root,root,-)
|
|
|
%doc %{_javadocdir}/%{name}
|
|
|
@@ -801,7 +830,7 @@ fi
|
|
|
# make java-1.5.0-gcj-javadoc own this file. Installing the
|
|
|
# corresponding JPackage over java-1.5.0-gcj-javadoc will work but
|
|
|
# will invalidate this file.
|
|
|
-%doc %{_javadocdir}/java
|
|
|
+#doc %{_javadocdir}/java
|
|
|
%endif
|
|
|
|
|
|
%if %{enable_plugin}
|
|
|
@@ -810,6 +839,10 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Sep 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwka.com> - 1.5.0.0-36
|
|
|
+- updated %%post, %%postun section to run update-alternatives --auto
|
|
|
+- updated classpath.security handling
|
|
|
+
|
|
|
* Fri Aug 13 2010 Ryoichi INAGAKI <ryo1@bc.wakwka.com> - 1.5.0.0-35
|
|
|
- Initial build for Vine Linux
|
|
|
|
inagaki