Re: GCC broken in rawhide?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 26 Jan 2018 14:52:24 +0100, Remi Collet wrote:

> DEBUG util.py:439:  Error: Transaction check error:
> DEBUG util.py:439:    file /usr/share/info/dir conflicts between
> attempted installs of annobin-3.2-1.fc28.x86_64 and info-6.5-1.fc28.x86_64
> 
> Seems related to
> https://src.fedoraproject.org/cgit/rpms/annobin.git/commit/?id=6b89f3290cbc9d2419bce617928b2f78b54836b8
> 

If the package would rebuild, I would have fixed it to fix the buildroot,
but it fails in the test suite.

diff --git a/annobin.spec b/annobin.spec
index f7891a6..1be0937 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -3,7 +3,7 @@
 Name:    annobin
 Summary: Binary annotation plugin for GCC
 Version: 3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 URL:     https://fedoraproject.org/wiki/Toolchain/Watermark
@@ -18,6 +18,9 @@ Source:  https://nickc.fedorapeople.org/annobin-%{version}.tar.xz
 # This is a gcc plugin, hence gcc is required.
 Requires: gcc
 
+Requires(post): info
+Requires(preun): info
+
 BuildRequires: gcc-plugin-devel pkgconfig coreutils
 
 %description
@@ -63,12 +66,21 @@ touch doc/annobin.info
 
 %install
 %make_install
+rm -f %{_buildroot}%{_infodir}/dir
 
 %if %{with tests}
 %check
 make check
 %endif
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ] ; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
 %files
 %{ANNOBIN_PLUGIN_DIR}
 %{_bindir}/built-by.sh
@@ -78,8 +90,7 @@ make check
 %exclude %{_datadir}/doc/annobin-plugin/COPYING3
 %exclude %{_datadir}/doc/annobin-plugin/LICENSE
 %doc %{_datadir}/doc/annobin-plugin/annotation.proposal.txt
-%{_infodir}
-%doc %{_infodir}/annobin.info.gz
+%{_infodir}/annobin.info*
 
 #---------------------------------------------------------------------------------
 
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Formulas]     [Fedora PHP Devel]     [Kernel Development]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Gimp]     [Yosemite News]
  Powered by Linux