Hello community,
here is the log from the commit of package java-1_5_0-gcj-compat for
openSUSE:Factory checked in at 2013-08-23 11:06:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat (Old)
and /work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_5_0-gcj-compat"
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes
2011-09-23 02:04:01.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
2013-08-23 11:06:01.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Aug 22 11:41:20 UTC 2013 - [email protected]
+
+- Drop gjdoc dependency and javadoc symlink
+ * gcj-compat won't be able to generate javadoc
+
+-------------------------------------------------------------------
+Wed Aug 21 10:27:01 UTC 2013 - [email protected]
+
+- use absolute path for update-alternatices
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_5_0-gcj-compat.spec ++++++
--- /var/tmp/diff_new_pack.EVtKOG/_old 2013-08-23 11:06:02.000000000 +0200
+++ /var/tmp/diff_new_pack.EVtKOG/_new 2013-08-23 11:06:02.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package java-1_5_0-gcj-compat (Version 1.5.0.0)
+# spec file for package java-1_5_0-gcj-compat
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -14,32 +14,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0
-Name: java-1_5_0-gcj-compat
-BuildRequires: gcc-gij gcc-java gjdoc python-devel unzip
-#!BuildIgnore: antlr
-BuildRequires: antlr-bootstrap
-# bnc#447342
-BuildRequires: openssl-certs
-%if %{?!suse_version:1}0
-%if %{?!mandriva_release:1}0
-BuildRequires: chkconfig which
-%endif
-%else
-BuildRequires: update-alternatives
-%endif
-%if %{undefined _jvmdir}
-%define _jvmdir %{_libdir}/jvm
-%endif
-%if %{undefined _jvmjardir}
-%define _jvmjardir %{_libdir}/jvm-exports
-%endif
-Version: 1.5.0.0
-Release: 109
%define section free
%define gccsuffix %{nil}
%define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc)
@@ -60,9 +37,13 @@
# FIXME: this is not a good fix of name issue
%define jvmdir %{_jvmdir}/%{sdklnk}%{gccbinsuffix}-%{version}
%define sdkjardir %{_jvmdir}/%{sdkdir}/lib
+
+Name: java-1_5_0-gcj-compat
+Version: 1.5.0.0
+Release: 0
Summary: JPackage Runtime Scripts for GCJ
-Group: Development/Languages/Java
License: GPL-2.0+
+Group: Development/Languages/Java
Url: ftp://sources.redhat.com/pub/rhug/java-gcj-compat
Source0: java-gcj-compat-%{jgcver}.tar.bz2
Source1: baselibs.conf
@@ -70,6 +51,17 @@
Patch0: gcc43-fixes.patch
Patch1: python_prefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+BuildRequires: gcc-gij
+BuildRequires: gcc-java
+BuildRequires: python-devel
+BuildRequires: unzip
+#!BuildIgnore: antlr
+BuildRequires: antlr-bootstrap
+# bnc#447342
+BuildRequires: openssl-certs
+BuildRequires: update-alternatives
+
# gcc-java should not be required, see Suse Bugzilla bug #151732
# even if it would be required it should have been a PreReq
# because gcj was called in the post install section
@@ -77,24 +69,21 @@
#Requires: gcc%{gccsuffix}-java >= %{gccver}
#PreReq: libgcj%{gccsuffix} >= %{gccver}
#Requires: libgcj%{gccsuffix} >= %{gccver}
-PreReq: gcc-gij
-%if %{?!suse_version:1}0
-%if %{?!mandriva_release:1}0
-PreReq: chkconfig which
-%endif
-%else
-PreReq: update-alternatives
-%endif
+Requires(pre): gcc-gij
+Requires(post): update-alternatives
PreReq: coreutils
-# Requires: gjdoc
# See java-1_4_2-sun.spec:
+Provides: j2re
+Provides: j2re = %{javaver}
+Provides: java = %{javaver}
+Provides: java-%{javaver}
+Provides: java-%{origin} = %{version}-%{release}
+Provides: jdbc-stdext
+Provides: jndi
+Provides: jre = %{javaver}
+Provides: jre-%{javaver}
Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
Provides: jre-%{origin} = %{version}-%{release}
-Provides: jre-%{javaver}, java-%{javaver}, jre = %{javaver}
-Provides: java-%{origin} = %{version}-%{release}
-Provides: java = %{javaver}
-Provides: jndi, jdbc-stdext
-Provides: j2re = %{javaver}, j2re
# 32-bit versus 64-bit specific provides:
%ifarch %ix86 ppc s390
%define bits 32
@@ -102,24 +91,33 @@
%ifarch x86_64 ia64 s390x ppc64
%define bits 64
%endif
+Provides: java-%{bits} = %{javaver}
+Provides: java-%{javaver}-%{bits}
+Provides: java-%{origin}-%{bits} = %{version}-%{release}
+Provides: jdbc-stdext-%{bits}
+Provides: jndi-%{bits}
+Provides: jre-%{bits} = %{javaver}
+Provides: jre-%{javaver}-%{bits}
Provides: jre-%{javaver}-%{origin}-%{bits} = %{version}-%{release}
Provides: jre-%{javaver}-%{origin}-%{bits} = %{version}-%{release}
Provides: jre-%{origin}-%{bits} = %{version}-%{release}
-Provides: jre-%{javaver}-%{bits}, java-%{javaver}-%{bits}, jre-%{bits} =
%{javaver}
-Provides: java-%{origin}-%{bits} = %{version}-%{release}
-Provides: java-%{bits} = %{javaver}
-Provides: jndi-%{bits}, jdbc-stdext-%{bits}
# See java-1_4_2-sun.spec and Suse Bugzilla bug #148186:
-Provides: jre1.1.x jre1.2.x jre1.3.x jre1.4.x jre1.5.x
+Provides: jre1.1.x
+Provides: jre1.2.x
+Provides: jre1.3.x
+Provides: jre1.4.x
+Provides: jre1.5.x
# See java-1_4_2-sun.spec and Suse Bugzilla bug #160828:
-Provides: jndi = %{javaver}, jndi-ldap = %{javaver}
-Provides: jndi-cos = %{javaver}, jndi-rmi = %{javaver}
-Provides: jndi-dns = %{javaver}
Provides: jaas = %{javaver}
+Provides: jndi = %{javaver}
+Provides: jndi-cos = %{javaver}
+Provides: jndi-dns = %{javaver}
+Provides: jndi-ldap = %{javaver}
+Provides: jndi-rmi = %{javaver}
# also provide the java_1_4_2-gcj-compat
# see comment 15 bug #341578
-Provides: java-1_4_2-gcj-compat
-Obsoletes: java-1_4_2-gcj-compat
+Provides: java-1_4_2-gcj-compat = %{version}-%{release}
+Obsoletes: java-1_4_2-gcj-compat < %{version}-%{release}
# not required #341578
# Requires: classpath
# let's provide it here for now
@@ -133,14 +131,7 @@
This package contains shell scripts and symbolic links to simulate a
JPackage Java runtime environment with GCJ.
-
-
-Authors:
---------
- Thomas Fitzsimmons <[email protected]>
-
%package devel
-License: GPL-2.0+
Summary: JPackage development scripts for GCJ
Group: Development/Languages/Java
PreReq: update-alternatives
@@ -148,35 +139,27 @@
# See Suse Bugzilla bug #151732 comment #17:
Requires: gcc-java >= %{gccver}
# Similar provides as in java-1_4_2-sun.spec:
-Provides: java-sdk-%{javaver}-%{origin} = %{version}
-Provides: java-sdk-%{javaver}
-Provides: java-sdk-%{origin} = %{version}
-Provides: java-sdk = %{javaver}
+Provides: classpath-devel = %{version}
Provides: java-%{javaver}-devel
-Provides: java-devel-%{origin} = %{version}
Provides: java-devel = %{javaver}
-Provides: classpath-devel = %{version}
+Provides: java-devel-%{origin} = %{version}
+Provides: java-sdk = %{javaver}
+Provides: java-sdk-%{javaver}
+Provides: java-sdk-%{javaver}-%{origin} = %{version}
+Provides: java-sdk-%{origin} = %{version}
Obsoletes: classpath-devel <= 0.95
Requires: %{name} = %{version}-%{release}
-# Why?
-Requires: gjdoc
# See java-1_4_2-sun.spec:
Provides: j2sdk = %{javaver}
# Be able to check bytecode version
Requires: unzip
-Provides: java-1_4_2-gcj-compat-devel
-Obsoletes: java-1_4_2-gcj-compat-devel
+Provides: java-1_4_2-gcj-compat-devel = %{version}-%{release}
+Obsoletes: java-1_4_2-gcj-compat-devel < %{version}-%{release}
%description devel
This package contains shell scripts and symbolic links to simulate a
JPackage Java development environment with GCJ.
-
-
-Authors:
---------
- Thomas Fitzsimmons <[email protected]>
-
%prep
%setup -q -n java-gcj-compat-%{jgcver}
%patch0 -p1
@@ -213,6 +196,10 @@
mkdir -p $RPM_BUILD_ROOT/%_libdir
mv $RPM_BUILD_ROOT/usr/local/%_lib/* $RPM_BUILD_ROOT/%_libdir || :
rm -rf $RPM_BUILD_ROOT/usr/local/
+
+rm -f %{buildroot}/%{_jvmdir}/%{sdkdir}/bin/javadoc
+rm -f %{buildroot}/%{_bindir}/gjdoc
+
# generate file lists
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
| sed 's|'$RPM_BUILD_ROOT'|%dir |' > %{name}-%{version}-all.files
@@ -230,17 +217,17 @@
rm -rf $RPM_BUILD_ROOT
%post
-update-alternatives \
+%{_sbindir}/update-alternatives \
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry
-update-alternatives \
+%{_sbindir}/update-alternatives \
--install %{_jvmdir}/jre-%{origin} \
jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
--slave %{_jvmjardir}/jre-%{origin} \
jre_%{origin}_exports %{_jvmjardir}/%{jrelnk}
-update-alternatives \
+%{_sbindir}/update-alternatives \
--install %{_jvmdir}/jre-%{javaver} \
jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \
--slave %{_jvmjardir}/jre-%{javaver} \
@@ -276,20 +263,19 @@
popd 1>/dev/null
%post devel
-update-alternatives \
+%{_sbindir}/update-alternatives \
--install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
--slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdklnk} \
- --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
--slave %{_bindir}/javah javah %{sdkbindir}/javah \
--slave %{_bindir}/jar jar %{sdkbindir}/jar \
--slave %{_bindir}/rmic rmic %{sdkbindir}/rmic
-update-alternatives \
+%{_sbindir}/update-alternatives \
--install %{_jvmdir}/java-%{origin} \
java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \
--slave %{_jvmjardir}/java-%{origin} \
java_sdk_%{origin}_exports %{_jvmjardir}/%{sdklnk}
-update-alternatives \
+%{_sbindir}/update-alternatives \
--install %{_jvmdir}/java-%{javaver} \
java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \
--slave %{_jvmjardir}/java-%{javaver} \
@@ -299,7 +285,7 @@
# `gcj%{gccsuffix} -print-file-name=include/jni.h` \
# %{_jvmdir}/%{cname}-%{version}/include/jni.h
# little work-around if no version-less link to libgcj-x.y.z.jar does not
exist
-if [ ! -e %{_javadir}/libgcj-tools.jar ] && ls %{_javadir}/libgcj-tools-*.jar
2>/dev/null >&2
+if [ ! -e %{_javadir}/libgcj-tool.sjar ] && ls %{_javadir}/libgcj-tools-*.jar
2>/dev/null >&2
then
pushd %{_javadir}/ 1>/dev/null
for file in `ls libgcj-tools-*.jar`
@@ -317,16 +303,16 @@
%postun
if [ $1 -eq 0 ] ; then
rm -rf %{jvmjardir}/*
- update-alternatives --remove java %{jrebindir}/java
- update-alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
- update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
+ %{_sbindir}/update-alternatives --remove java %{jrebindir}/java
+ %{_sbindir}/update-alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
+ %{_sbindir}/update-alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
fi
%postun devel
if [ $1 -eq 0 ] ; then
- update-alternatives --remove javac %{sdkbindir}/javac
- update-alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
- update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
+ %{_sbindir}/update-alternatives --remove javac %{sdkbindir}/javac
+ %{_sbindir}/update-alternatives --remove java_sdk_%{origin}
%{_jvmdir}/%{sdklnk}
+ %{_sbindir}/update-alternatives --remove java_sdk_%{javaver}
%{_jvmdir}/%{sdklnk}
fi
## gcc-java requires libgcj and provides the gcj we run for the version
## string
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
