From bb232301e4b99d1e85ac72d9edd03a73dbb93b9303c8e41209d938327d98354c Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Tue, 4 Feb 2014 10:13:06 +0000
Subject: [PATCH 1/3] - Provide POSIX c99 command executing gcc -std=gnu99. 
 [bnc#861923] - Remove gcc-z9 wrapper which is obsolete.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=45
---
 c99         |  4 ++++
 gcc.changes |  6 ++++++
 gcc.spec    | 31 +++++--------------------------
 3 files changed, 15 insertions(+), 26 deletions(-)
 create mode 100644 c99

diff --git a/c99 b/c99
new file mode 100644
index 0000000..8c87d39
--- /dev/null
+++ b/c99
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Despite asking for a c99 compiler allow GNU extensions to work
+# as we are on a GNU/Linux system anyway
+exec /usr/bin/c99 -xc -std=gnu99 "$@"
diff --git a/gcc.changes b/gcc.changes
index 1591189..ca0a390 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  4 10:08:54 UTC 2014 - rguenther@suse.com
+
+- Provide POSIX c99 command executing gcc -std=gnu99.  [bnc#861923]
+- Remove gcc-z9 wrapper which is obsolete.
+
 -------------------------------------------------------------------
 Mon Dec  2 15:34:27 UTC 2013 - rguenther@suse.com
 
diff --git a/gcc.spec b/gcc.spec
index 573a740..f8af99d 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcc
 #
-# 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
@@ -334,16 +334,6 @@ Requires:       gcc%{gcc_version}-ada
 The system GNU Ada Compiler.
 %endif
 
-%package -n gcc-z9
-Summary:        The system GNU C Compiler
-License:        GPL-3.0+
-Group:          Development/Languages/C and C++
-Requires:       gcc
-
-%description -n gcc-z9
-The system GNU C Compiler.
-
-
 %prep 
 
 %build
@@ -409,20 +399,15 @@ ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++
 ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
 ln -sf g++-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/c++.1.gz
 ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
-%ifarch s390 s390x
-dir=`gcc-%{gcc_suffix} -print-prog-name=cc1`
-dir=${dir%/cc1}
-mkdir -p $RPM_BUILD_ROOT/$dir
-cat > $RPM_BUILD_ROOT/$dir/defaults.spec <<EOF
-*default_spec:
-%{!mtune=*:-mtune=z10} %{!march=*:-march=z9-109}
-EOF
-%endif
+# Provide the POSIX c99 command
+cp $RPM_SOURCE_DIR/c99 $RPM_BUILD_ROOT%{_prefix}/bin/
+chmod 755 $RPM_BUILD_ROOT%{_prefix}/bin/c99
 
 %files
 %defattr(-,root,root)
 %{_prefix}/bin/gcc
 %{_prefix}/bin/cc
+%{_prefix}/bin/c99
 %{_prefix}/bin/gcov
 %{_prefix}/bin/gcc-ar
 %{_prefix}/bin/gcc-nm
@@ -600,12 +585,6 @@ EOF
 %{_prefix}/bin/gij64
 %{_prefix}/bin/grmiregistry64
 
-%endif
-%ifarch s390 s390x
-
-%files -n gcc-z9
-%defattr(-,root,root)
-/usr/lib*/gcc/*-suse-linux/*/defaults.spec
 %endif
 
 %changelog

From 8c2d065a9dd0cb221b3f939f8cbadfe84a3b9ba919996204e5e5d14a7ef4e1c6 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Tue, 4 Feb 2014 10:13:43 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=46

---
 gcc.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gcc.spec b/gcc.spec
index f8af99d..2488edf 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -52,6 +52,7 @@ Requires:       gcc%{gcc_version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc%{gcc_version}
 Source:         cpp
+Source1:        c99
 Source99:       README.packaging
 
 %description

From 1e211e6bf41f96718b03b33a80cc2df27f2bf65fc91836f64c880f54e2096d40 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Tue, 4 Feb 2014 13:04:22 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=47

---
 c99         | 4 ----
 gcc.changes | 1 -
 gcc.spec    | 5 -----
 3 files changed, 10 deletions(-)
 delete mode 100644 c99

diff --git a/c99 b/c99
deleted file mode 100644
index 8c87d39..0000000
--- a/c99
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Despite asking for a c99 compiler allow GNU extensions to work
-# as we are on a GNU/Linux system anyway
-exec /usr/bin/c99 -xc -std=gnu99 "$@"
diff --git a/gcc.changes b/gcc.changes
index ca0a390..b67a5e2 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,7 +1,6 @@
 -------------------------------------------------------------------
 Tue Feb  4 10:08:54 UTC 2014 - rguenther@suse.com
 
-- Provide POSIX c99 command executing gcc -std=gnu99.  [bnc#861923]
 - Remove gcc-z9 wrapper which is obsolete.
 
 -------------------------------------------------------------------
diff --git a/gcc.spec b/gcc.spec
index 2488edf..e9ade30 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -52,7 +52,6 @@ Requires:       gcc%{gcc_version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc%{gcc_version}
 Source:         cpp
-Source1:        c99
 Source99:       README.packaging
 
 %description
@@ -400,15 +399,11 @@ ln -sf g++-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/c++
 ln -sf gcc-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/cc
 ln -sf g++-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/c++.1.gz
 ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
-# Provide the POSIX c99 command
-cp $RPM_SOURCE_DIR/c99 $RPM_BUILD_ROOT%{_prefix}/bin/
-chmod 755 $RPM_BUILD_ROOT%{_prefix}/bin/c99
 
 %files
 %defattr(-,root,root)
 %{_prefix}/bin/gcc
 %{_prefix}/bin/cc
-%{_prefix}/bin/c99
 %{_prefix}/bin/gcov
 %{_prefix}/bin/gcc-ar
 %{_prefix}/bin/gcc-nm