commit java-1_5_0-gcj-compat for openSUSE:Factory

2017-10-06 Thread root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2017-10-06 10:54:10

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"

Fri Oct  6 10:54:10 2017 rev:38 rq:529906 version:1.5.0.0

Changes:

--- 
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes  
2017-09-17 22:35:56.436800619 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2017-10-06 10:54:10.665456414 +0200
@@ -1,0 +2,5 @@
+Fri Sep 29 11:48:44 UTC 2017 - fst...@suse.com
+
+- Doesn't really depend on antlr-bootstrap or antlr
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.8XuFn5/_old  2017-10-06 10:54:11.329356074 +0200
+++ /var/tmp/diff_new_pack.8XuFn5/_new  2017-10-06 10:54:11.337354866 +0200
@@ -55,13 +55,11 @@
 # Call gij instead of gcj in the "java" wrapper script:
 Patch0: gcc43-fixes.patch
 Patch1: python_prefix.patch
-BuildRequires:  antlr-bootstrap
 BuildRequires:  gcc-gij
 BuildRequires:  gcc-java
 BuildRequires:  python-devel
 BuildRequires:  unzip
 BuildRequires:  update-alternatives
-#!BuildIgnore:  antlr
 Requires(post): coreutils
 Requires(post): sed
 Requires(post): update-alternatives




commit java-1_5_0-gcj-compat for openSUSE:Factory

2017-09-17 Thread root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2017-09-17 22:35:55

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"

Sun Sep 17 22:35:55 2017 rev:37 rq:526026 version:1.5.0.0

Changes:

--- 
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes  
2017-09-12 19:39:41.511543962 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2017-09-17 22:35:56.436800619 +0200
@@ -1,0 +2,14 @@
+Wed Sep 13 13:18:26 UTC 2017 - fst...@suse.com
+
+- Instead of a symlink to gcj, make javac a script that runs the
+  gcj's ecj.jar. This provides for us a javac that has compatible
+  options with OpenJDK's javac.
+
+---
+Mon Sep 11 11:09:03 UTC 2017 - fst...@suse.com
+
+- Clean the spec file a bit
+- Link required header files to the jvmdir in order to allow build
+  with different versions of gcj and gcc
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.jYPSuP/_old  2017-09-17 22:35:58.248545897 +0200
+++ /var/tmp/diff_new_pack.jYPSuP/_new  2017-09-17 22:35:58.252545335 +0200
@@ -17,9 +17,9 @@
 
 
 %define sectionfree
-%define gccsuffix %{nil}
+%define gccsuffix   %(rpm -q --qf "%{VERSION}" gcc-java | sed 's#\.##g')
 %define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc-java)
-%defineorigin  gcj%{gccsuffix}
+%defineorigin  gcj
 %define priority   1505
 %definejavaver 1.5.0
 %define buildver   0
@@ -55,30 +55,18 @@
 # Call gij instead of gcj in the "java" wrapper script:
 Patch0: gcc43-fixes.patch
 Patch1: python_prefix.patch
-#!BuildIgnore:  antlr
 BuildRequires:  antlr-bootstrap
-%if 0%{?suse_version} > 1230
-BuildRequires:  ca-certificates-mozilla
-%else
-BuildRequires:  openssl-certs
-%endif
 BuildRequires:  gcc-gij
 BuildRequires:  gcc-java
 BuildRequires:  python-devel
 BuildRequires:  unzip
 BuildRequires:  update-alternatives
+#!BuildIgnore:  antlr
 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
-# now the gcj related stuff is only done via triggerin
-#Requires:   gcc%{gccsuffix}-java >= %{gccver}
-#PreReq: libgcj%{gccsuffix} >= %{gccver}
-#Requires:   libgcj%{gccsuffix} >= %{gccver}
-Requires(pre):   sed
 Requires(post):  sed
+Requires(post): update-alternatives
 Requires(pre):  gcc-gij
+Requires(pre):  sed
 # See java-1_4_2-sun.spec:
 Provides:   j2re = %{javaver}
 Provides:   java = %{javaver}
@@ -96,7 +84,6 @@
 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:
@@ -124,7 +111,11 @@
 Provides:   classpath-jta = %{version}
 Obsoletes:  classpath-jta <= 0.95
 Provides:   jta
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%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
@@ -134,8 +125,7 @@
 Summary:JPackage development scripts for GCJ
 Group:  Development/Languages/Java
 Requires:   %{name} = %{version}-%{release}
-# See Suse Bugzilla bug #151732 comment #17:
-Requires:   gcc-java >= %{gccver}
+Requires:   gcc%{gccsuffix}-java >= %{gccver}
 # Be able to check bytecode version
 Requires:   unzip
 Requires(post): coreutils
@@ -178,7 +168,7 @@
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 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
@@ -203,6 +193,19 @@
 rm -f %{buildroot}/%{_jvmdir}/%{sdkdir}/bin/javadoc
 rm -f %{buildroot}/%{_bindir}/gjdoc
 
+# Create a script that uses the gcj's ecj.jar as java compiler.
+# This provides javac that is 

commit java-1_5_0-gcj-compat for openSUSE:Factory

2017-09-12 Thread root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2017-09-12 19:39:41

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"

Tue Sep 12 19:39:41 2017 rev:36 rq:522156 version:1.5.0.0

Changes:

--- 
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes  
2017-09-07 22:10:37.636851011 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2017-09-12 19:39:41.511543962 +0200
@@ -23,0 +24,6 @@
+Mon Sep 19 14:18:15 UTC 2016 - fst...@suse.com
+
+- Exclude in the -devel package some files/links that were ending
+  up in both and creating 09-check-packaged-twice check errors.
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.DnIQgU/_old  2017-09-12 19:39:42.035470330 +0200
+++ /var/tmp/diff_new_pack.DnIQgU/_new  2017-09-12 19:39:42.035470330 +0200
@@ -374,6 +374,9 @@
 %{_jvmdir}/%{jrelnk}
 %{_jvmjardir}/
 %exclude %{_jvmjardir}/%{sdklnk}
+%exclude %{_jvmjardir}/java-%{javaver}
+%exclude %{_jvmjardir}/java-%{origin}
+%exclude %{_jvmjardir}/java
 %{jvmjardir}
 %{_jvmdir}/%{jredir}/lib/security
 %{_bindir}/aot-compile




commit java-1_5_0-gcj-compat for openSUSE:Factory

2017-09-07 Thread root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2017-09-07 22:10:37

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"

Thu Sep  7 22:10:37 2017 rev:35 rq:520568 version:1.5.0.0

Changes:

--- 
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes  
2017-05-06 20:45:18.307482921 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2017-09-07 22:10:37.636851011 +0200
@@ -1,0 +2,5 @@
+Fri Sep  1 11:28:41 UTC 2017 - pmonrealgonza...@suse.com
+
+- Added Require: sed to fix installation problems. [bsc#1056718]
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.lIGuTD/_old  2017-09-07 22:10:38.420740526 +0200
+++ /var/tmp/diff_new_pack.lIGuTD/_new  2017-09-07 22:10:38.424739962 +0200
@@ -76,6 +76,8 @@
 #Requires:   gcc%{gccsuffix}-java >= %{gccver}
 #PreReq: libgcj%{gccsuffix} >= %{gccver}
 #Requires:   libgcj%{gccsuffix} >= %{gccver}
+Requires(pre):   sed
+Requires(post):  sed
 Requires(pre):  gcc-gij
 # See java-1_4_2-sun.spec:
 Provides:   j2re = %{javaver}




commit java-1_5_0-gcj-compat for openSUSE:Factory

2017-05-06 Thread root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2017-05-06 20:45:17

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"

Sat May  6 20:45:17 2017 rev:34 rq:492247 version:1.5.0.0

Changes:

--- 
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes  
2017-03-21 22:46:26.493142311 +0100
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2017-05-06 20:45:18.307482921 +0200
@@ -1,0 +2,5 @@
+Fri Apr 28 12:27:32 UTC 2017 - Bernhard M. Wiedemann 
+
+- Fix package build for SLE-11-SP4
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.Q2Y8jK/_old  2017-05-06 20:45:19.287344693 +0200
+++ /var/tmp/diff_new_pack.Q2Y8jK/_new  2017-05-06 20:45:19.291344129 +0200
@@ -57,7 +57,11 @@
 Patch1: python_prefix.patch
 #!BuildIgnore:  antlr
 BuildRequires:  antlr-bootstrap
+%if 0%{?suse_version} > 1230
 BuildRequires:  ca-certificates-mozilla
+%else
+BuildRequires:  openssl-certs
+%endif
 BuildRequires:  gcc-gij
 BuildRequires:  gcc-java
 BuildRequires:  python-devel




commit java-1_5_0-gcj-compat for openSUSE:Factory

2017-03-21 Thread root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2017-03-21 22:46:25

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"

Tue Mar 21 22:46:25 2017 rev:33 rq:480904 version:1.5.0.0

Changes:

--- 
/work/SRC/openSUSE:Factory/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes  
2016-08-29 14:28:45.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2017-03-21 22:46:26.493142311 +0100
@@ -1,0 +2,12 @@
+Fri Mar 17 10:16:44 UTC 2017 - rguent...@suse.com
+
+- Adjust gcc version extraction similarly to gcc-java as we
+  require gcc-java, not gcc.
+
+---
+Fri Mar 17 09:09:17 UTC 2017 - rguent...@suse.com
+
+- Properly extract binary suffix from gcc-java, not gcc which may
+  now differ in version.
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.vh2igF/_old  2017-03-21 22:46:28.660835854 +0100
+++ /var/tmp/diff_new_pack.vh2igF/_new  2017-03-21 22:46:28.664835288 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_5_0-gcj-compat
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,12 +18,12 @@
 
 %define sectionfree
 %define gccsuffix %{nil}
-%define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc)
+%define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc-java)
 %defineorigin  gcj%{gccsuffix}
 %define priority   1505
 %definejavaver 1.5.0
 %define buildver   0
-%define gccver %(rpm -q --qf "%{VERSION}" gcc)
+%define gccver %(rpm -q --qf "%{VERSION}" gcc-java)
 %define jgcver 1.0.80
 %define cname java-%{javaver}-%{origin}%{gccbinsuffix}
 %definesdklnk  java-%{javaver}-%{origin}




commit java-1_5_0-gcj-compat for openSUSE:Factory

2016-08-29 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2016-08-29 14:28:33

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  
2015-06-23 11:54:58.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2016-08-29 14:28:45.0 +0200
@@ -1,0 +2,5 @@
+Wed Aug 24 08:36:37 UTC 2016 - tchva...@suse.com
+
+- Add correct alternatives listing bnc#994284
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.RXs6iU/_old  2016-08-29 14:28:48.0 +0200
+++ /var/tmp/diff_new_pack.RXs6iU/_new  2016-08-29 14:28:48.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_5_0-gcj-compat
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,7 @@
 %define jvmdir  %{_jvmdir}/%{sdklnk}%{gccbinsuffix}-%{version}
 %define sdkjardir   %{_jvmdir}/%{sdkdir}/lib
 # 32-bit versus 64-bit specific provides:
-%ifarch %ix86 ppc s390
+%ifarch %{ix86} ppc s390
 %define bits 32
 %endif
 %ifarch x86_64 ia64 s390x ppc64
@@ -57,6 +57,7 @@
 Patch1: python_prefix.patch
 #!BuildIgnore:  antlr
 BuildRequires:  antlr-bootstrap
+BuildRequires:  ca-certificates-mozilla
 BuildRequires:  gcc-gij
 BuildRequires:  gcc-java
 BuildRequires:  python-devel
@@ -118,12 +119,6 @@
 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
@@ -177,7 +172,7 @@
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 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
@@ -215,6 +210,46 @@
 install -d -m 0755 %{buildroot}/%{_jvmdir}/%{jredir}/lib/security/
 install -m 0644 cacerts %{buildroot}/%{_jvmdir}/%{jredir}/lib/security/
 
+# alternatives regular
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
+touch "%{buildroot}%{_sysconfdir}/alternatives/java"
+ln -sf %{_sysconfdir}/alternatives/java %{buildroot}%{_bindir}/java
+touch "%{buildroot}%{_sysconfdir}/alternatives/jre"
+ln -sf %{_sysconfdir}/alternatives/jre %{buildroot}%{_jvmdir}/jre
+touch "%{buildroot}%{_sysconfdir}/alternatives/jre_exports"
+ln -sf %{_sysconfdir}/alternatives/jre_exports %{buildroot}%{_jvmjardir}/jre
+touch "%{buildroot}%{_sysconfdir}/alternatives/rmiregistry"
+ln -sf %{_sysconfdir}/alternatives/rmiregistry 
%{buildroot}%{_bindir}/rmiregistry
+touch "%{buildroot}%{_sysconfdir}/alternatives/jre_%{origin}"
+ln -sf %{_sysconfdir}/alternatives/jre_%{origin} 
%{buildroot}%{_jvmdir}/jre-%{origin}
+touch "%{buildroot}%{_sysconfdir}/alternatives/jre_%{origin}_exports"
+ln -sf %{_sysconfdir}/alternatives/jre_%{origin}_exports 
%{buildroot}%{_jvmjardir}/jre-%{origin}
+touch "%{buildroot}%{_sysconfdir}/alternatives/jre_%{javaver}"
+ln -sf %{_sysconfdir}/alternatives/jre_%{javaver} 
%{buildroot}%{_jvmdir}/jre-%{javaver}
+touch "%{buildroot}%{_sysconfdir}/alternatives/jre_%{javaver}_exports"
+ln -sf %{_sysconfdir}/alternatives/jre_%{javaver}_exports 
%{buildroot}%{_jvmjardir}/jre-%{javaver}
+# alternatives devel
+touch "%{buildroot}%{_sysconfdir}/alternatives/javac"
+ln -sf %{_sysconfdir}/alternatives/javac %{buildroot}%{_bindir}/javac
+touch "%{buildroot}%{_sysconfdir}/alternatives/java_sdk"
+ln -sf %{_sysconfdir}/alternatives/java_sdk %{buildroot}%{_jvmdir}/java
+touch "%{buildroot}%{_sysconfdir}/alternatives/java_sdk_exports"
+ln -sf %{_sysconfdir}/alternatives/java_sdk_exports 
%{buildroot}%{_jvmjardir}/java
+touch "%{buildroot}%{_sysconfdir}/alternatives/javah"
+ln -sf %{_sysconfdir}/alternatives/javah %{buildroot}%{_bindir}/javah
+touch "%{buildroot}%{_sysconfdir}/alternatives/jar"
+ln -sf %{_sysconfdir}/alternatives/jar %{buildroot}%{_bindir}/jar
+touch "%{buildroot}%{_sysconfdir}/alternatives/rmic"
+ln -sf %{_sysconfdir}/alternatives/rmic 

commit java-1_5_0-gcj-compat for openSUSE:Factory

2015-06-23 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2015-06-23 11:54:56

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-11-15 12:17:24.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2015-06-23 11:54:58.0 +0200
@@ -1,0 +2,5 @@
+Thu Jun 18 13:38:53 UTC 2015 - tchva...@suse.com
+
+- Use priority matching to ibm-java, always 5 bigger than it
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.jI4IPb/_old  2015-06-23 11:54:58.0 +0200
+++ /var/tmp/diff_new_pack.jI4IPb/_new  2015-06-23 11:54:58.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_5_0-gcj-compat
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define gccsuffix %{nil}
 %define gccbinsuffix %(rpm -q --qf -%{VERSION} gcc)
 %defineorigin  gcj%{gccsuffix}
-%define priority   1500
+%define priority   1505
 %definejavaver 1.5.0
 %define buildver   0
 %define gccver %(rpm -q --qf %{VERSION} gcc)




commit java-1_5_0-gcj-compat for openSUSE:Factory

2014-11-15 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2014-11-15 11:44:27

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-10-18 09:08:40.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2014-11-15 12:17:24.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 09 04:59:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in post/postun scripts
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.Vh8yld/_old  2014-11-15 12:17:25.0 +0100
+++ /var/tmp/diff_new_pack.Vh8yld/_new  2014-11-15 12:17:25.0 +0100
@@ -238,16 +238,16 @@
 # little work-around if no version-less link to libgcj-x.y.z.jar does not exist
 if [ ! -e %{_javadir}/libgcj.jar ]  ls %{_javadir}/libgcj-[0-9]*.jar 
2/dev/null 2
 then
-  pushd %{_javadir}/ 1/dev/null
+  cd %{_javadir}
   for file in `ls libgcj-[0-9]*.jar`
   do
 LIBGCJ_NAME=$file
   done
-  popd 1/dev/null
+  cd - /dev/null
 else
   LIBGCJ_NAME=libgcj.jar
 fi
-pushd %{jvmjardir} 1/dev/null
+cd %{jvmjardir}
ln -sf %{_javadir}/$LIBGCJ_NAME jndi-%{version}.jar
ln -sf %{_javadir}/$LIBGCJ_NAME jndi-ldap-%{version}.jar
ln -sf %{_javadir}/$LIBGCJ_NAME jndi-cos-%{version}.jar
@@ -259,7 +259,7 @@
   ln -fs ${jar} $(echo $jar | sed s|-%{version}.jar|-%{javaver}.jar|g)
   ln -fs ${jar} $(echo $jar | sed s|-%{version}.jar|.jar|g)
done
-popd 1/dev/null
+cd - /dev/null
 
 %post devel
 %{_sbindir}/update-alternatives \
@@ -286,18 +286,18 @@
 # little work-around if no version-less link to libgcj-x.y.z.jar does not exist
 if [ ! -e %{_javadir}/libgcj-tool.sjar ]  ls %{_javadir}/libgcj-tools-*.jar 
2/dev/null 2
 then
-  pushd %{_javadir}/ 1/dev/null
+  cd %{_javadir}
   for file in `ls libgcj-tools-*.jar`
   do
 LIBGCJTOOLS_NAME=$file
   done
-  popd 1/dev/null
+  cd - /dev/null
 else
   LIBGCJTOOLS_NAME=libgcj-tools.jar
 fi
-pushd %{sdkjardir} 1/dev/null
+cd %{sdkjardir}
   ln -sf %{_javadir}/$LIBGCJTOOLS_NAME tools.jar
-popd 1/dev/null
+cd - /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit java-1_5_0-gcj-compat for openSUSE:Factory

2014-10-18 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2014-10-18 09:08:22

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-08-06 11:42:08.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2014-10-18 09:08:40.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 15 19:15:07 UTC 2014 - fst...@suse.com
+
+- Add symlink gnative2ascii-4.3 - native2ascii into gcc43 fixes
+
+---



Other differences:
--
++ gcc43-fixes.patch ++
--- /var/tmp/diff_new_pack.vlTXlP/_old  2014-10-18 09:08:41.0 +0200
+++ /var/tmp/diff_new_pack.vlTXlP/_new  2014-10-18 09:08:41.0 +0200
@@ -1,13 +1,12 @@
-Index: java-gcj-compat-1.0.76/Makefile.in
-===
 java-gcj-compat-1.0.76.orig/Makefile.in2007-04-16 17:49:50.0 
+0200
-+++ java-gcj-compat-1.0.76/Makefile.in 2007-11-28 14:59:51.0 +0100
-@@ -482,13 +482,13 @@ install-data-local:
+--- java-gcj-compat-1.0.80/Makefile.in 2009-02-19 13:57:57.0 +0100
 java-gcj-compat-1.0.80/Makefile.in 2014-10-15 21:14:32.212604646 +0200
+@@ -489,13 +489,14 @@
$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
ln -sf ../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/java
ln -sf ../../../../../bin/gij$(gcc_suffix) $(DESTDIR)$(JRE_BIN_DIR)/java
 -  ln -sf ../../../../bin/fastjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar
 -  ln -sf ../../../../bin/sinjdoc $(DESTDIR)$(SDK_BIN_DIR)/javadoc
++  ln -sf ../../../../bin/gnative2ascii$(gcc_suffix) 
$(DESTDIR)$(SDK_BIN_DIR)/native2ascii
 +  ln -sf ../../../../bin/gjar$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/jar
 +  ln -sf ../../../../bin/gjdoc $(DESTDIR)$(SDK_BIN_DIR)/javadoc
ln -sf ../../../../bin/grmic$(gcc_suffix) $(DESTDIR)$(SDK_BIN_DIR)/rmic

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit java-1_5_0-gcj-compat for openSUSE:Factory

2014-08-06 Thread h_root
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.0 +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.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 28 07:08:02 UTC 2014 - tchva...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.S9GfKK/_new  2014-08-06 11:42:09.0 +0200
@@ -14,7 +14,6 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 %define sectionfree
@@ -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:
 

commit java-1_5_0-gcj-compat for openSUSE:Factory

2014-06-25 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2014-06-25 15:24: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  
2014-06-17 11:22:47.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2014-06-25 15:24:01.0 +0200
@@ -1,0 +2,5 @@
+Mon Jun 23 05:34:24 UTC 2014 - meiss...@suse.com
+
+- buildrequire ca-certificates-mozilla for certificate store build
+
+---



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.J1aDC3/_old  2014-06-25 15:24:02.0 +0200
+++ /var/tmp/diff_new_pack.J1aDC3/_new  2014-06-25 15:24:02.0 +0200
@@ -59,7 +59,11 @@
 #!BuildIgnore:  antlr
 BuildRequires:  antlr-bootstrap
 # bnc#447342
+%if %suse_version = 1230
+BuildRequires:  ca-certificates-mozilla
+%else
 BuildRequires:  openssl-certs
+%endif
 BuildRequires:  update-alternatives
 
 # gcc-java should not be required, see Suse Bugzilla bug #151732

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit java-1_5_0-gcj-compat for openSUSE:Factory

2014-06-17 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2014-06-17 11:22:46

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  
2013-08-23 11:06:01.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.java-1_5_0-gcj-compat.new/java-1_5_0-gcj-compat.changes
 2014-06-17 11:22:47.0 +0200
@@ -1,0 +2,7 @@
+Fri Jun  6 10:04:45 UTC 2014 - tchva...@suse.com
+
+- Version bump to latest gcj compat package 1.0.80 with few small
+  fixes.
+- Fedora retired this package completely now
+
+---

Old:

  java-gcj-compat-1.0.76.tar.bz2

New:

  java-gcj-compat-1.0.80.tar.gz



Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.bfhnod/_old  2014-06-17 11:22:48.0 +0200
+++ /var/tmp/diff_new_pack.bfhnod/_new  2014-06-17 11:22:48.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_5_0-gcj-compat
 #
-# Copyright (c) 2013 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
@@ -25,7 +25,7 @@
 %definejavaver 1.5.0
 %define buildver   0
 %define gccver %(rpm -q --qf %{VERSION} gcc)
-%define jgcver 1.0.76
+%define jgcver 1.0.80
 %define cname java-%{javaver}-%{origin}%{gccbinsuffix}
 %definesdklnk  java-%{javaver}-%{origin}
 %definejrelnk  jre-%{javaver}-%{origin}
@@ -45,7 +45,7 @@
 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
+Source0:
ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
 Source1:baselibs.conf
 # Call gij instead of gcj in the java wrapper script:
 Patch0: gcc43-fixes.patch
@@ -171,50 +171,51 @@
 done
 
 %build
-%configure --disable-symlinks --with-gcc-suffix=%{gccbinsuffix} 
--with-jvm-root-dir=%{_jvmdir} --with-java-home=%{_jvmdir}
-make
+%configure \
+   --disable-symlinks \
+   --with-gcc-suffix=%{gccbinsuffix} \
+   --with-jvm-root-dir=%{_jvmdir} \
+   --with-java-home=%{_jvmdir}
+make %{?_smp_mflags}
 
 %install
 %makeinstall 
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib
+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 
$RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib/jdtcore.jar
-ln -sf %{_javadir}/libgcj%{gccbinsuffix}.jar 
$RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{cname}-%{version}/include
-mkdir $RPM_BUILD_ROOT%{_jvmdir} || :
-pushd $RPM_BUILD_ROOT%{_jvmdir}
+ln -sf %{_javadir}/libgcj%{gccbinsuffix}.jar 
%{buildroot}%{_jvmdir}/%{cname}-%{version}/jre/lib/jdtcore.jar
+ln -sf %{_javadir}/libgcj%{gccbinsuffix}.jar 
%{buildroot}%{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar
+install -dm 755 %{buildroot}%{_jvmdir}/%{cname}-%{version}/include
+mkdir %{buildroot}%{_jvmdir} || :
+pushd %{buildroot}%{_jvmdir}
ln -s %{jredir} %{jrelnk}
ln -s %{sdkdir} %{sdklnk}
 popd
-mkdir -p $RPM_BUILD_ROOT/%{jvmjardir}|| :
-pushd $RPM_BUILD_ROOT%{_jvmjardir}
+mkdir -p %{buildroot}/%{jvmjardir}|| :
+pushd %{buildroot}%{_jvmjardir}
ln -s %{sdkdir} %{jrelnk}
ln -s %{sdkdir} %{sdklnk}
 popd
-mkdir -p $RPM_BUILD_ROOT/%{sdkjardir}|| :
-mkdir -p $RPM_BUILD_ROOT/%_bindir
-mkdir -p $RPM_BUILD_ROOT/%_libdir
-mv $RPM_BUILD_ROOT/usr/local/%_lib/* $RPM_BUILD_ROOT/%_libdir || :
-rm -rf $RPM_BUILD_ROOT/usr/local/
+mkdir -p %{buildroot}/%{sdkjardir}|| :
+mkdir -p %{buildroot}/%_bindir
+mkdir -p %{buildroot}/%_libdir
+mv %{buildroot}/usr/local/%_lib/* %{buildroot}/%_libdir || :
+rm -rf %{buildroot}/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
-find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
-  | sed 's|'$RPM_BUILD_ROOT'||'   %{name}-%{version}-all.files
+find %{buildroot}%{_jvmdir}/%{jredir} -type d \
+  | sed 's|'%{buildroot}'|%dir |'   %{name}-%{version}-all.files
+find 

commit java-1_5_0-gcj-compat for openSUSE:Factory

2013-08-23 Thread h_root
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.0 +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.0 +0200
@@ -1,0 +2,11 @@
+Thu Aug 22 11:41:20 UTC 2013 - mvysko...@suse.com
+
+- Drop gjdoc dependency and javadoc symlink 
+  * gcj-compat won't be able to generate javadoc
+
+---
+Wed Aug 21 10:27:01 UTC 2013 - mvysko...@suse.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.EVtKOG/_new  2013-08-23 11:06:02.0 +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 sectionfree
 %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 

commit java-1_5_0-gcj-compat for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package java-1_5_0-gcj-compat for 
openSUSE:Factory checked in at 2011-12-06 18:20:26

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, Maintainer is 
bnc-team-j...@forge.provo.novell.com

Changes:




Other differences:
--
++ java-1_5_0-gcj-compat.spec ++
--- /var/tmp/diff_new_pack.hvQc9K/_old  2011-12-06 18:35:25.0 +0100
+++ /var/tmp/diff_new_pack.hvQc9K/_new  2011-12-06 18:35:25.0 +0100
@@ -62,7 +62,7 @@
 %define sdkjardir   %{_jvmdir}/%{sdkdir}/lib
 Summary:JPackage Runtime Scripts for GCJ
 Group:  Development/Languages/Java
-License:GPLv2+
+License:GPL-2.0+
 Url:ftp://sources.redhat.com/pub/rhug/java-gcj-compat
 Source0:java-gcj-compat-%{jgcver}.tar.bz2
 Source1:baselibs.conf
@@ -140,7 +140,7 @@
 Thomas Fitzsimmons fitz...@redhat.com
 
 %package devel
-License:GPLv2+
+License:GPL-2.0+
 Summary:JPackage development scripts for GCJ
 Group:  Development/Languages/Java
 PreReq: update-alternatives

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org