Merge remote-tracking branch 'up/f31' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2019-08-21 12:35:39 -07:00
commit a07e2a91f4
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 13 additions and 24 deletions

View File

@ -1,10 +1,9 @@
Summary: Utilities for working with md5sum implanted in ISO images
Name: isomd5sum
Version: 1.2.3
Release: 3.0.riscv64%{?dist}
Release: 6.0.riscv64%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/System
Url: https://github.com/rhinstaller/isomd5sum
Source0: https://github.com/rhinstaller/%{name}/archive/%{version}.tar.gz
@ -13,7 +12,7 @@ Patch0: isomd5sum-1.2.3-add-riscv64.patch
BuildRequires: gcc
BuildRequires: popt-devel
BuildRequires: python2-devel python3-devel
BuildRequires: python3-devel
%description
The isomd5sum package contains utilities for implanting and verifying
@ -21,7 +20,6 @@ an md5sum implanted into an ISO9660 image.
%package devel
Summary: Development headers and library for using isomd5sum
Group: Development/System
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: %{name}-static = %{epoch}:%{version}-%{release}
@ -29,14 +27,6 @@ Provides: %{name}-static = %{epoch}:%{version}-%{release}
This contains header files and a library for working with the isomd5sum
implanting and checking.
%package -n python2-isomd5sum
Summary: Python bindings for isomd5sum
%{?python_provide:%python_provide python2-isomd5sum}
%description -n python2-isomd5sum
The isomd5sum package contains utilities for implanting and verifying
an md5sum implanted into an ISO9660 image.
%package -n python3-isomd5sum
Summary: Python bindings for isomd5sum
@ -48,24 +38,16 @@ an md5sum implanted into an ISO9660 image.
%prep
%autosetup
rm -rf %{py3dir}
cp -a . %{py3dir}
%build
CFLAGS="$RPM_OPT_FLAGS -Wno-strict-aliasing"; export CFLAGS
LDFLAGS="$RPM_LD_FLAGS"; export LDFLAGS
PYTHON=%{__python2} make checkisomd5 implantisomd5 pyisomd5sum.so
pushd %{py3dir}
PYTHON=%{__python3} make checkisomd5 implantisomd5 pyisomd5sum.so
popd
%install
PYTHON=%{__python2} make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel install-python
pushd %{py3dir}
PYTHON=%{__python3} make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel install-python
popd
%files
%license COPYING
@ -78,16 +60,23 @@ popd
%{_libdir}/*.a
/usr/share/pkgconfig/isomd5sum.pc
%files -n python2-isomd5sum
%{python2_sitearch}/pyisomd5sum.so
%files -n python3-isomd5sum
%{python3_sitearch}/pyisomd5sum.so
%changelog
* Sun Aug 26 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:1.2.3-3.0.riscv64
* Wed Aug 21 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1:1.2.3-6.0.riscv64
- Add support for riscv64
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1:1.2.3-4
- Subpackage python2-isomd5sum has been removed
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild