From 8b0dc564852d3ebf2ec9c315c16a086ec3ea252b3743906b57972427c07adcd6 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 16 Feb 2009 11:33:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gcc?expand=0&rev=13

---
 gcc.changes | 10 ++++++++++
 gcc.spec    | 29 +++++++++--------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/gcc.changes b/gcc.changes
index 27308ac..1cc44d8 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Feb 16 11:03:38 CET 2009 - rguenther@suse.de
+
+- Enable links for classpath binaries and manpages again.
+
+-------------------------------------------------------------------
+Fri Jan  9 15:35:45 CET 2009 - rguenther@suse.de
+
+- On ppc64 obsolete gcc-objc-64bit by gcc-objc.
+
 -------------------------------------------------------------------
 Thu Dec  4 18:26:30 CET 2008 - matz@suse.de
 
diff --git a/gcc.spec b/gcc.spec
index 11aaa1e..c2f80ff 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcc (Version 4.3)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -32,7 +32,7 @@ Url:            http://gcc.gnu.org/
 %define gcc_suffix 4.3
 License:        GPL v2 or later
 Version:        4.3
-Release:        59
+Release:        61
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Provides:       c_compiler
@@ -269,6 +269,9 @@ Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
 Requires:       gcc%{gcc_version}-objc
 Requires:       gcc = %{version}
+%ifarch ppc64
+Obsoletes:      gcc-objc-64bit
+%endif
 
 %description -n gcc-objc
 The system GNU Objective C Compiler.
@@ -398,28 +401,21 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-objc/
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-obj-c++/
 # Link all the binaries
-#  - do not link binaries that conflict with classpath for now
 for program in \
         gcc gcov \
         g++ \
         cpp \
 	gcj gcjh gcj-dbtool jcf-dump jv-convert gc-analyze \
 	gij \
-%if 0
 	gappletviewer \
 	gjar gjarsigner gjavah gkeytool gnative2ascii gorbd grmic \
 	grmid grmiregistry gserialver gtnameserv \
-%endif
 %if %{separate_bi32}
-%if 0
 	grmiregistry32 \
-%endif
 	gij32 \
 %endif
 %if %{separate_bi64}
-%if 0
 	grmiregistry64 \
-%endif
 	gij64 \
 %endif
         gfortran \
@@ -429,7 +425,6 @@ for program in \
   ln -sf $program-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/$program
 done
 # Link section 1 manpages
-#  - do not link manpages that conflict with classpath for now
 for man1 in \
         gcc gcov \
         g++ \
@@ -437,11 +432,9 @@ for man1 in \
         gfortran \
 	gcj gcjh gcj-dbtool jcf-dump jv-convert gc-analyze \
 	gij \
-%if 0
 	gappletviewer gjar gjarsigner gjavah \
 	gkeytool gnative2ascii gorbd grmic grmid grmiregistry gserialver \
 	gtnameserv \
-%endif
     ; do
   ln -sf $man1-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$man1.1.gz
 done
@@ -508,7 +501,6 @@ EOF
 %files -n gcc-gij
 %defattr(-,root,root)
 %{_prefix}/bin/gij
-%if 0
 %{_prefix}/bin/gappletviewer
 %{_prefix}/bin/gjar
 %{_prefix}/bin/gjarsigner
@@ -521,9 +513,7 @@ EOF
 %{_prefix}/bin/grmiregistry
 %{_prefix}/bin/gserialver
 %{_prefix}/bin/gtnameserv
-%endif
 %doc %{_mandir}/man1/gij.1.gz
-%if 0
 %doc %{_mandir}/man1/gappletviewer.1.gz
 %doc %{_mandir}/man1/gjar.1.gz
 %doc %{_mandir}/man1/gjarsigner.1.gz
@@ -536,7 +526,6 @@ EOF
 %doc %{_mandir}/man1/grmiregistry.1.gz
 %doc %{_mandir}/man1/gserialver.1.gz
 %doc %{_mandir}/man1/gtnameserv.1.gz
-%endif
 
 %files -n gcc-objc
 %defattr(-,root,root)
@@ -609,9 +598,7 @@ EOF
 %files -n gcc-gij-32bit
 %defattr(-,root,root)
 %{_prefix}/bin/gij32
-%if 0
 %{_prefix}/bin/grmiregistry32
-%endif
 
 %files -n libffi-devel-32bit
 %defattr(-,root,root)
@@ -638,9 +625,7 @@ EOF
 %files -n gcc-gij-64bit
 %defattr(-,root,root)
 %{_prefix}/bin/gij64
-%if 0
 %{_prefix}/bin/grmiregistry64
-%endif
 
 %files -n libffi-devel-64bit
 %defattr(-,root,root)
@@ -655,6 +640,10 @@ EOF
 %endif
 
 %changelog
+* Mon Feb 16 2009 rguenther@suse.de
+- Enable links for classpath binaries and manpages again.
+* Fri Jan 09 2009 rguenther@suse.de
+- On ppc64 obsolete gcc-objc-64bit by gcc-objc.
 * Thu Dec 04 2008 matz@suse.de
 - Add new gcc-z9 package on s390 and s390x to change the
   default -march and -mtune settings.