From b727a945331abae319393a9724286486292e5e5fdb846cda8df5c520118583ca Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 6 Jun 2017 10:38:12 +0000 Subject: [PATCH 1/5] Accepting request 501345 from home:marxin:gcc-to-merge Add gcov-tool and gcov-dump. OBS-URL: https://build.opensuse.org/request/show/501345 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=78 --- gcc.changes | 5 +++++ gcc.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc.changes b/gcc.changes index 9f19b1e..5f5e9d4 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 6 09:55:59 UTC 2017 - mliska@suse.cz + +- Include gcov-tool and gcov-dump binaries. + ------------------------------------------------------------------- Thu Apr 13 08:52:35 UTC 2017 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 44bc985..d61cfe6 100644 --- a/gcc.spec +++ b/gcc.spec @@ -381,7 +381,7 @@ 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 for program in \ - gcc gcov \ + gcc gcov gcov-dump gcov-tool \ g++ \ cpp \ gfortran \ @@ -395,7 +395,7 @@ for program in \ done # Link section 1 manpages for man1 in \ - gcc gcov \ + gcc gcov gcov-dump gcov-tool \ g++ \ cpp \ gfortran \ @@ -431,6 +431,8 @@ EOF %{_prefix}/bin/gcc %{_prefix}/bin/cc %{_prefix}/bin/gcov +%{_prefix}/bin/gcov-dump +%{_prefix}/bin/gcov-tool %{_prefix}/bin/gcc-ar %{_prefix}/bin/gcc-nm %{_prefix}/bin/gcc-ranlib @@ -439,6 +441,8 @@ EOF %doc %{_mandir}/man1/gcc.1.gz %doc %{_mandir}/man1/cc.1.gz %doc %{_mandir}/man1/gcov.1.gz +%doc %{_mandir}/man1/gcov-dump.1.gz +%doc %{_mandir}/man1/gcov-tool.1.gz %files -n cpp %defattr(-,root,root) From c7f984eccf8962883964a240357dd22b66957595a3083351c9566ec224d4f4f5 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 7 Jun 2017 11:40:15 +0000 Subject: [PATCH 2/5] - Guard gcc-devel so it is only built on Tumbleweed. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=79 --- gcc.changes | 5 +++++ gcc.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gcc.changes b/gcc.changes index 5f5e9d4..fe7fdc0 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 7 11:39:55 UTC 2017 - rguenther@suse.com + +- Guard gcc-devel so it is only built on Tumbleweed. + ------------------------------------------------------------------- Tue Jun 6 09:55:59 UTC 2017 - mliska@suse.cz diff --git a/gcc.spec b/gcc.spec index d61cfe6..7c2b4b9 100644 --- a/gcc.spec +++ b/gcc.spec @@ -450,9 +450,12 @@ EOF %{_prefix}/bin/cpp %doc %{_mandir}/man1/cpp.1.gz +# Plugins are only enabled for Tumbleweed +%if %{suse_version} == 1330 %files -n gcc-devel %defattr(-,root,root) # empty - only for the dependency +%endif %files -n gcc-c++ %defattr(-,root,root) From a786bd09971f9ee304a05e448b1eb5e28d7d9d8cac0ec9f19f1a47b649671fa9 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 7 Jun 2017 11:51:49 +0000 Subject: [PATCH 3/5] - Remove bogus link to versioned g++.info file which doesn't exist. Instead refer to gcc.info from the g++ info directory entry. [bnc#922419] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=80 --- gcc.changes | 3 +++ gcc.spec | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc.changes b/gcc.changes index fe7fdc0..07e0852 100644 --- a/gcc.changes +++ b/gcc.changes @@ -2,6 +2,9 @@ Wed Jun 7 11:39:55 UTC 2017 - rguenther@suse.com - Guard gcc-devel so it is only built on Tumbleweed. +- Remove bogus link to versioned g++.info file which doesn't exist. + Instead refer to gcc.info from the g++ info directory entry. + [bnc#922419] ------------------------------------------------------------------- Tue Jun 6 09:55:59 UTC 2017 - mliska@suse.cz diff --git a/gcc.spec b/gcc.spec index 7c2b4b9..8b3a7f8 100644 --- a/gcc.spec +++ b/gcc.spec @@ -128,7 +128,7 @@ The system GNU Compiler documentation. %post -n gcc-info %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=g++ --description='The GNU C++ compiler.' %{_infodir}/gcc.info.gz %install_info --info-dir=%{_infodir} --name=gfortran --description='The GNU Fortran compiler.' %{_infodir}/gfortran.info.gz # if we uninstall, clean the entries @@ -136,7 +136,7 @@ The system GNU Compiler documentation. 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=g++ %{_infodir}/gcc.info.gz %install_info --delete --info-dir=%{_infodir} --name=gfortran %{_infodir}/gfortran.info.gz fi @@ -403,7 +403,7 @@ for man1 in \ 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++ gfortran ; do +for info in cpp gcc 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 @@ -489,7 +489,6 @@ EOF %defattr(-,root,root) %{_infodir}/cpp.info.gz %{_infodir}/gcc.info.gz -%{_infodir}/g++.info.gz %{_infodir}/gfortran.info.gz %if %{build_ada} From b7156f43ff689d248444e19a385ce5611d03ef743c3fc1f051074915dade3631 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 9 Jun 2017 11:19:50 +0000 Subject: [PATCH 4/5] - Fix gcc-devel guard to use %sle_version. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=81 --- gcc.changes | 5 +++++ gcc.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc.changes b/gcc.changes index 07e0852..b0bf130 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 9 11:19:29 UTC 2017 - rguenther@suse.com + +- Fix gcc-devel guard to use %sle_version. + ------------------------------------------------------------------- Wed Jun 7 11:39:55 UTC 2017 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 8b3a7f8..59016e4 100644 --- a/gcc.spec +++ b/gcc.spec @@ -451,7 +451,7 @@ EOF %doc %{_mandir}/man1/cpp.1.gz # Plugins are only enabled for Tumbleweed -%if %{suse_version} == 1330 +%if 0%{!?sle_version:1} %files -n gcc-devel %defattr(-,root,root) # empty - only for the dependency From e02a6202e1fca012d5c66fc2a34ae421fc7013aa859ba9ad2be0210e23e388d7 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 9 Jun 2017 11:26:57 +0000 Subject: [PATCH 5/5] - Fix gcc-devel guard to use %sle_version. [bnc#1043590] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=82 --- gcc.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.changes b/gcc.changes index b0bf130..57ba9f0 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Jun 9 11:19:29 UTC 2017 - rguenther@suse.com -- Fix gcc-devel guard to use %sle_version. +- Fix gcc-devel guard to use %sle_version. [bnc#1043590] ------------------------------------------------------------------- Wed Jun 7 11:39:55 UTC 2017 - rguenther@suse.com