From a786bd09971f9ee304a05e448b1eb5e28d7d9d8cac0ec9f19f1a47b649671fa9 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 7 Jun 2017 11:51:49 +0000 Subject: [PATCH] - 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}