From abdec0efe038accd5e987cbe86a15e4480c9a52df6692fafbae01884439fbe4c Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 2 Dec 2013 15:35:21 +0000 Subject: [PATCH 1/2] - Move gcc-ar, gcc-nm and gcc-ranlib to the gcc package instead of packaging them separately. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=42 --- gcc.changes | 6 ++++++ gcc.spec | 45 +++------------------------------------------ 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/gcc.changes b/gcc.changes index 1a39dfb..1591189 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 2 15:34:27 UTC 2013 - rguenther@suse.com + +- Move gcc-ar, gcc-nm and gcc-ranlib to the gcc package instead + of packaging them separately. + ------------------------------------------------------------------- Wed Jun 19 12:24:24 UTC 2013 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 2b5f288..5ac913b 100644 --- a/gcc.spec +++ b/gcc.spec @@ -341,36 +341,6 @@ Requires: gcc The system GNU C Compiler. -%package -n gcc-ar -Summary: Plugin aware AR utility -License: GPL-3.0+ -Group: Development/Languages/C and C++ -Requires: gcc - -%description -n gcc-ar -Linker plugin aware AR utility. - - -%package -n gcc-nm -Summary: Plugin aware NM utility -License: GPL-3.0+ -Group: Development/Languages/C and C++ -Requires: gcc - -%description -n gcc-nm -Linker plugin aware NM utility. - - -%package -n gcc-ranlib -Summary: Plugin aware RANLIB utility -License: GPL-3.0+ -Group: Development/Languages/C and C++ -Requires: gcc - -%description -n gcc-ranlib -Linker plugin aware RANLIB utility. - - %prep %build @@ -451,6 +421,9 @@ EOF %{_prefix}/bin/gcc %{_prefix}/bin/cc %{_prefix}/bin/gcov +%{_prefix}/bin/gcc-ar +%{_prefix}/bin/gcc-nm +%{_prefix}/bin/gcc-ranlib %doc %{_mandir}/man1/gcc.1.gz %doc %{_mandir}/man1/cc.1.gz %doc %{_mandir}/man1/gcov.1.gz @@ -632,16 +605,4 @@ EOF /usr/lib*/gcc/*-suse-linux/*/defaults.spec %endif -%files -n gcc-ar -%defattr(-,root,root) -%{_prefix}/bin/gcc-ar - -%files -n gcc-nm -%defattr(-,root,root) -%{_prefix}/bin/gcc-nm - -%files -n gcc-ranlib -%defattr(-,root,root) -%{_prefix}/bin/gcc-ranlib - %changelog From 138a1f68b26f9fa093871e21e10ae30560df6d6811bad13f06bacf7079df0b23 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 3 Dec 2013 13:54:21 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=43 --- gcc.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc.spec b/gcc.spec index 5ac913b..573a740 100644 --- a/gcc.spec +++ b/gcc.spec @@ -43,7 +43,10 @@ Summary: The system GNU C Compiler License: GPL-3.0+ Group: Development/Languages/C and C++ Provides: c_compiler +Obsoletes: gcc-ar Obsoletes: gcc-mudflap +Obsoletes: gcc-nm +Obsoletes: gcc-ranlib Requires: cpp Requires: gcc%{gcc_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build