Accepting request 452111 from devel:gcc

Please stage with SR#452110, these make it possible to retain gcc-java
when updating to GCC 7 (which no longer provides Java so GCC Java has to come
from GCC 6).

- Remove java related packages, those are in a separate gcc-java now.

OBS-URL: https://build.opensuse.org/request/show/452111
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcc?expand=0&rev=57

gcc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 23 12:36:58 UTC 2017 - rguenther@suse.com
+
+- Remove java related packages, those are in a separate gcc-java now.
+
 -------------------------------------------------------------------
 Thu Aug 18 07:32:25 UTC 2016 - rguenther@suse.com
 

gcc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gcc
 #
-# 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
@@ -130,7 +130,6 @@ The system GNU Compiler documentation.
 %install_info --info-dir=%{_infodir} --name=cpp --description='The GNU C preprocessor.' %{_infodir}/cpp.info.gz
 %install_info --info-dir=%{_infodir} --name=gcc --description='The GNU Compiler Collection.' %{_infodir}/gcc.info.gz
 %install_info --info-dir=%{_infodir} --name=g++ --description='The GNU C++ compiler.' %{_infodir}/g++.info.gz
-%install_info --info-dir=%{_infodir} --name=gcj --description='Ahead-of-time compiler for the Java language' %{_infodir}/gcj.info.gz
 %install_info --info-dir=%{_infodir} --name=gfortran --description='The GNU Fortran compiler.' %{_infodir}/gfortran.info.gz
 
 # if we uninstall, clean the entries
@@ -139,7 +138,6 @@ if [ "$1" -eq "0" ] ; then
   %install_info --delete --info-dir=%{_infodir} --name=cpp %{_infodir}/cpp.info.gz
   %install_info --delete --info-dir=%{_infodir} --name=gcc %{_infodir}/gcc.info.gz
   %install_info --delete --info-dir=%{_infodir} --name=g++ %{_infodir}/g++.info.gz
-  %install_info --delete --info-dir=%{_infodir} --name=gcj %{_infodir}/gcj.info.gz
   %install_info --delete --info-dir=%{_infodir} --name=gfortran %{_infodir}/gfortran.info.gz
 fi
 
@@ -244,63 +242,6 @@ Requires:       gcc-fortran = %{version}
 The system GNU Fortran Compiler 64 bit support.
 
 
-%package -n gcc-java
-Summary:        The system GNU Java Compiler
-License:        GPL-3.0+
-Group:          Development/Languages/Java
-Requires:       gcc%{gcc_version}-java
-Requires:       libgcj-devel = %{version}
-Recommends:     gcc-gij = %{version}
-Requires:       gcc = %{version}
-
-%description -n gcc-java
-The system GNU Java Compiler.
-
-
-
-%package -n libgcj-devel
-Summary:        The system GNU Java development files.
-License:        GPL-2.0-with-classpath-exception
-Group:          Development/Libraries/Java
-Requires:       libgcj-devel-gcc%{gcc_version}
-
-%description -n libgcj-devel
-The system GNU Java development files.
-
-
-
-%package -n gcc-gij
-Summary:        The system GNU Java bytecode interpreter
-License:        GPL-2.0+
-Group:          Development/Languages/Java
-Requires:       gcc%{gcc_version}-gij
-
-%description -n gcc-gij
-The system GNU Java bytecode interpreter.
-
-
-
-%package -n gcc-gij-32bit
-Summary:        The system GNU Java bytecode interpreter
-License:        GPL-2.0+
-Group:          Development/Languages/Java
-Requires:       gcc%{gcc_version}-gij-32bit
-
-%description -n gcc-gij-32bit
-The system GNU Java bytecode interpreter as 32 bit application.
-
-
-
-%package -n gcc-gij-64bit
-Summary:        The system GNU Java bytecode interpreter
-License:        GPL-2.0+
-Group:          Development/Languages/Java
-Requires:       gcc%{gcc_version}-gij-64bit
-
-%description -n gcc-gij-64bit
-The system GNU Java bytecode interpreter as 64 bit application.
-
-
 
 %package -n gcc-objc
 Summary:        The system GNU Objective C Compiler
@@ -445,19 +386,6 @@ for program in \
         gcc gcov \
         g++ \
         cpp \
-	gcj gcjh gcj-dbtool jcf-dump jv-convert gc-analyze \
-	gij \
-	gappletviewer \
-	gjar gjarsigner gjavah gkeytool gnative2ascii gorbd grmic \
-	grmid grmiregistry gserialver gtnameserv \
-%if %{separate_bi32}
-	grmiregistry32 \
-	gij32 \
-%endif
-%if %{separate_bi64}
-	grmiregistry64 \
-	gij64 \
-%endif
         gfortran \
 %if %{build_ada}
 	gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr \
@@ -473,16 +401,11 @@ for man1 in \
         g++ \
         cpp \
         gfortran \
-	gcj gcjh gcj-dbtool jcf-dump jv-convert gc-analyze \
-	gij \
-	gappletviewer gjar gjarsigner gjavah \
-	gkeytool gnative2ascii gorbd grmic grmid grmiregistry gserialver \
-	gtnameserv \
     ; do
   ln -sf $man1-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$man1.1.gz
 done
 # Link info pages
-for info in cpp gcc g++ gcj gfortran ; do
+for info in cpp gcc g++ gfortran ; do
   ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
 done
 # Provide the traditional /lib/cpp that only handles C
@@ -542,50 +465,6 @@ EOF
 %{_prefix}/bin/gfortran
 %doc %{_mandir}/man1/gfortran.1.gz
 
-%files -n gcc-java
-%defattr(-,root,root)
-%{_prefix}/bin/gcj
-%{_prefix}/bin/gcjh
-%{_prefix}/bin/gcj-dbtool
-%{_prefix}/bin/jcf-dump
-%{_prefix}/bin/jv-convert
-%{_prefix}/bin/gc-analyze
-%doc %{_mandir}/man1/gcj.1.gz
-%doc %{_mandir}/man1/gcjh.1.gz
-%doc %{_mandir}/man1/gcj-dbtool.1.gz
-%doc %{_mandir}/man1/jcf-dump.1.gz
-%doc %{_mandir}/man1/jv-convert.1.gz
-%doc %{_mandir}/man1/gc-analyze.1.gz
-
-%files -n gcc-gij
-%defattr(-,root,root)
-%{_prefix}/bin/gij
-%{_prefix}/bin/gappletviewer
-%{_prefix}/bin/gjar
-%{_prefix}/bin/gjarsigner
-%{_prefix}/bin/gjavah
-%{_prefix}/bin/gkeytool
-%{_prefix}/bin/gnative2ascii
-%{_prefix}/bin/gorbd
-%{_prefix}/bin/grmic
-%{_prefix}/bin/grmid
-%{_prefix}/bin/grmiregistry
-%{_prefix}/bin/gserialver
-%{_prefix}/bin/gtnameserv
-%doc %{_mandir}/man1/gij.1.gz
-%doc %{_mandir}/man1/gappletviewer.1.gz
-%doc %{_mandir}/man1/gjar.1.gz
-%doc %{_mandir}/man1/gjarsigner.1.gz
-%doc %{_mandir}/man1/gjavah.1.gz
-%doc %{_mandir}/man1/gkeytool.1.gz
-%doc %{_mandir}/man1/gnative2ascii.1.gz
-%doc %{_mandir}/man1/gorbd.1.gz
-%doc %{_mandir}/man1/grmic.1.gz
-%doc %{_mandir}/man1/grmid.1.gz
-%doc %{_mandir}/man1/grmiregistry.1.gz
-%doc %{_mandir}/man1/gserialver.1.gz
-%doc %{_mandir}/man1/gtnameserv.1.gz
-
 %files -n gcc-objc
 %defattr(-,root,root)
 # empty - only for the dependency
@@ -610,7 +489,6 @@ EOF
 %{_infodir}/cpp.info.gz
 %{_infodir}/gcc.info.gz
 %{_infodir}/g++.info.gz
-%{_infodir}/gcj.info.gz
 %{_infodir}/gfortran.info.gz
 
 %if %{build_ada}
@@ -637,11 +515,6 @@ EOF
 # empty - only for the dependency
 %doc README
 
-%files -n libgcj-devel
-%defattr(-,root,root)
-# empty - only for the dependency
-%doc README
-
 %files -n gcc-go
 %defattr(-,root,root)
 # empty - only for the dependency
@@ -674,11 +547,6 @@ EOF
 # empty - only for the dependency
 %doc README
 
-%files -n gcc-gij-32bit
-%defattr(-,root,root)
-%{_prefix}/bin/gij32
-%{_prefix}/bin/grmiregistry32
-
 %if %{build_ada}
 %files -n gcc-ada-32bit
 %defattr(-,root,root)
@@ -719,11 +587,6 @@ EOF
 # empty - only for the dependency
 %doc README
 
-%files -n gcc-gij-64bit
-%defattr(-,root,root)
-%{_prefix}/bin/gij64
-%{_prefix}/bin/grmiregistry64
-
 %if %{build_ada}
 %files -n gcc-ada-64bit
 %defattr(-,root,root)