#5 Fix incorrectly-arched dependency on hedley-static
Merged 2 years ago by jaruga. Opened 2 years ago by jaruga.
rpms/ jaruga/simde wip/fix-installation  into  rawhide

file modified
+5 -2
@@ -20,7 +20,7 @@ 

  Version: 0.0.0

  # Align the release format with the packages setting Source0 by commit hash

  # such as podman.spec and moby-engine.spec.

- Release: 9.git%{short_commit_simde}%{?dist}

+ Release: 10.git%{short_commit_simde}%{?dist}

  Summary: SIMD Everywhere

  # find simde/ -type f | xargs licensecheck

  #   simde: MIT
@@ -61,7 +61,7 @@ 

  Provides: %{name}-static = %{version}-%{release}

  # The API includes the hedley header-only library.

  Requires: hedley-devel%{?_isa}

- Requires: hedley-static%{?_isa}

+ Requires: hedley-static

  

  %description devel

  The simde-devel package contains the header files needed
@@ -191,6 +191,9 @@ 

  %{_includedir}/%{name}

  

  %changelog

+ * Wed Mar 24 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.0-10.git396e05c

+ - Fix incorrectly-arched dependency on hedley-static

+ 

  * Tue Mar 23 2021 Jun Aruga <jaruga@redhat.com> - 0.0.0-9.git396e05c

  - Fix a warning by the rpmlint.

  

It causes the following error.

$ mock -i simde-devel-0.0.0-9.git396e05c.fc35.x86_64.rpm
...
Error:
 Problem: conflicting requests
  - nothing provides hedley-static(x86-64) needed by simde-devel-0.0.0-9.git396e05c.fc35.x86_64
(try to add '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages)
ERROR: Command failed:
 # /usr/bin/systemd-nspawn -q -M 2813fa54988e4566a9633eb81ef43a51 -D /var/lib/mock/fedora-rawhide-x86_64-bootstrap/root -a --capability=cap_ipc_lock --bind=/tmp/mock-resolv.tp5_6hr0:/etc/resolv.conf --console=pipe --setenv=TERM=vt100 --setenv=SHELL=/bin/bash --setenv=HOME=/var/lib/mock/fedora-rawhide-x86_64/root/installation-homedir --setenv=HOSTNAME=mock --setenv=PATH=/usr/bin:/bin:/usr/sbin:/sbin --setenv=PROMPT_COMMAND=printf "\033]0;<mock-chroot>\007" --setenv=PS1=<mock-chroot> \s-\v\$  --setenv=LANG=C.UTF-8 --setenv=LC_MESSAGES=C.UTF-8 --resolv-conf=off /usr/bin/dnf --installroot /var/lib/mock/fedora-rawhide-x86_64/root/ --releasever 33 --setopt=deltarpm=False --allowerasing --disableplugin=local --disableplugin=spacewalk install /builddir/simde-devel-0.0.0-9.git396e05c.fc35.x86_64.rpm --setopt=tsflags=nocontexts

Resolves: rhbz#1942422

rebased onto 9d6253a

2 years ago

rebased onto d55bd28

2 years ago

I confirmed the installation is okay.

$ mock -i simde-devel-0.0.0-10.git396e05c.fc35.x86_64.rpm

Confirmed hedley-devel is installed and the symbolic link is correct.

<mock-chroot> sh-5.1# rpm -qa | grep hed
hedley-devel-15-1.fc35.x86_64

<mock-chroot> sh-5.1# ll /usr/include/simde/hedley.h
lrwxrwxrwx. 1 root root 11 Mar 24 20:27 /usr/include/simde/hedley.h -> ../hedley.h

The rpmlint is ok my local.

$ rpmlint --file simde.rpmlintrc *.spec result2/*.rpm
2 packages and 1 specfiles checked; 0 errors, 0 warnings.

Build succeeded.

Pull-Request has been merged by jaruga

2 years ago
Metadata