Hello community,
here is the log from the commit of package java-1_5_0-gcj-compat for
openSUSE:Factory checked in at 2014-08-06 11:42:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-06-25 15:24:01.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
2014-08-06 11:42:08.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 28 07:08:02 UTC 2014 - [email protected]
+
+- Update bit with spec-cleaner.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_5_0-gcj-compat.spec ++++++
--- /var/tmp/diff_new_pack.S9GfKK/_old 2014-08-06 11:42:09.000000000 +0200
+++ /var/tmp/diff_new_pack.S9GfKK/_new 2014-08-06 11:42:09.000000000 +0200
@@ -14,7 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# icecream 0
%define section free
@@ -37,7 +36,13 @@
# FIXME: this is not a good fix of name issue
%define jvmdir %{_jvmdir}/%{sdklnk}%{gccbinsuffix}-%{version}
%define sdkjardir %{_jvmdir}/%{sdkdir}/lib
-
+# 32-bit versus 64-bit specific provides:
+%ifarch %ix86 ppc s390
+%define bits 32
+%endif
+%ifarch x86_64 ia64 s390x ppc64
+%define bits 64
+%endif
Name: java-1_5_0-gcj-compat
Version: 1.5.0.0
Release: 0
@@ -50,22 +55,15 @@
# Call gij instead of gcj in the "java" wrapper script:
Patch0: gcc43-fixes.patch
Patch1: python_prefix.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
+#!BuildIgnore: antlr
+BuildRequires: antlr-bootstrap
BuildRequires: gcc-gij
BuildRequires: gcc-java
BuildRequires: python-devel
BuildRequires: unzip
-#!BuildIgnore: antlr
-BuildRequires: antlr-bootstrap
-# bnc#447342
-%if %suse_version >= 1230
-BuildRequires: ca-certificates-mozilla
-%else
-BuildRequires: openssl-certs
-%endif
BuildRequires: update-alternatives
-
+Requires(post): coreutils
+Requires(post): 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
@@ -74,36 +72,25 @@
#PreReq: libgcj%{gccsuffix} >= %{gccver}
#Requires: libgcj%{gccsuffix} >= %{gccver}
Requires(pre): gcc-gij
-Requires(post): update-alternatives
-PreReq: coreutils
# 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}
-# 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
-%define bits 32
-%endif
-%ifarch x86_64 ia64 s390x ppc64
-%define bits 64
-%endif
Provides: java-%{bits} = %{javaver}
+Provides: java-%{javaver}
Provides: java-%{javaver}-%{bits}
+Provides: java-%{origin} = %{version}-%{release}
Provides: java-%{origin}-%{bits} = %{version}-%{release}
+Provides: jdbc-stdext
Provides: jdbc-stdext-%{bits}
Provides: jndi-%{bits}
+Provides: jre = %{javaver}
Provides: jre-%{bits} = %{javaver}
+Provides: jre-%{javaver}
Provides: jre-%{javaver}-%{bits}
+Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
Provides: jre-%{javaver}-%{origin}-%{bits} = %{version}-%{release}
Provides: jre-%{javaver}-%{origin}-%{bits} = %{version}-%{release}
+Provides: jre-%{origin} = %{version}-%{release}
Provides: jre-%{origin}-%{bits} = %{version}-%{release}
# See java-1_4_2-sun.spec and Suse Bugzilla bug #148186:
Provides: jre1.1.x
@@ -130,6 +117,13 @@
Provides: classpath-jta = %{version}
Obsoletes: classpath-jta <= 0.95
Provides: jta
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# bnc#447342
+%if 0%{?suse_version} >= 1230
+BuildRequires: ca-certificates-mozilla
+%else
+BuildRequires: openssl-certs
+%endif
%description
This package contains shell scripts and symbolic links to simulate a
@@ -138,10 +132,13 @@
%package devel
Summary: JPackage development scripts for GCJ
Group: Development/Languages/Java
-PreReq: update-alternatives
-PreReq: coreutils
+Requires: %{name} = %{version}-%{release}
# See Suse Bugzilla bug #151732 comment #17:
Requires: gcc-java >= %{gccver}
+# Be able to check bytecode version
+Requires: unzip
+Requires(post): coreutils
+Requires(post): update-alternatives
# Similar provides as in java-1_4_2-sun.spec:
Provides: classpath-devel = %{version}
Provides: java-%{javaver}-devel
@@ -152,11 +149,8 @@
Provides: java-sdk-%{javaver}-%{origin} = %{version}
Provides: java-sdk-%{origin} = %{version}
Obsoletes: classpath-devel <= 0.95
-Requires: %{name} = %{version}-%{release}
# 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 = %{version}-%{release}
Obsoletes: java-1_4_2-gcj-compat-devel < %{version}-%{release}
@@ -169,7 +163,7 @@
%patch0 -p1
%patch1
# bnc#447342
-for key in /etc/ssl/certs/*.pem; do
+for key in %{_sysconfdir}/ssl/certs/*.pem; do
# workaround for bnc#546843
(yes | gkeytool%{gccbinsuffix} -import -keystore cacerts -file $key
-storepass "" -alias `basename $key`) || :
done
@@ -183,7 +177,7 @@
make %{?_smp_mflags}
%install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
install -dm 755 %{buildroot}%{_jvmdir}/%{cname}-%{version}/jre/lib
# make a link to ecj.jar in the lib dir:
ln -sf %{_javadir}/libgcj%{gccbinsuffix}.jar
%{buildroot}%{_jvmdir}/%{cname}-%{version}/jre/lib/jdtcore.jar
@@ -200,10 +194,10 @@
ln -s %{sdkdir} %{sdklnk}
popd
mkdir -p %{buildroot}/%{sdkjardir}|| :
-mkdir -p %{buildroot}/%_bindir
-mkdir -p %{buildroot}/%_libdir
-mv %{buildroot}/usr/local/%_lib/* %{buildroot}/%_libdir || :
-rm -rf %{buildroot}/usr/local/
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_libdir}
+mv %{buildroot}%{_prefix}/local/%{_lib}/* %{buildroot}/%{_libdir} || :
+rm -rf %{buildroot}%{_prefix}/local/
rm -f %{buildroot}/%{_jvmdir}/%{sdkdir}/bin/javadoc
rm -f %{buildroot}/%{_bindir}/gjdoc
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
