Compare commits
No commits in common. "9a08f24e48be5035a89bb5be9b692af5233344bb" and "e2ca6bece8306166e47fb4a9366cec85636cc92e" have entirely different histories.
9a08f24e48
...
e2ca6bece8
@ -1,26 +0,0 @@
|
||||
From c8376fb7589920ab9fcb1daafc6166af7c7f21a7 Mon Sep 17 00:00:00 2001
|
||||
From: Jingyun Hua <huajingyun@loongson.cn>
|
||||
Date: Wed, 11 Jan 2023 16:43:06 +0800
|
||||
Subject: [PATCH] fix build error for loongarch64
|
||||
|
||||
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c98cf35..f966afd 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,7 +4,7 @@ PYTHONINCLUDE := $(shell $(PYTHON)-config --includes)
|
||||
|
||||
VERSION=1.2.3
|
||||
|
||||
-ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64,$(shell uname -m)))
|
||||
+ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64,$(shell uname -m)))
|
||||
LIBDIR = lib64
|
||||
else
|
||||
LIBDIR = lib
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- isomd5sum-1.2.3/Makefile 2018-04-11 01:30:32.000000000 +0800
|
||||
+++ isomd5sum-1.2.3/Makefile.new 2023-02-18 19:45:13.543992122 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
VERSION=1.2.3
|
||||
|
||||
-ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64,$(shell uname -m)))
|
||||
+ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64 riscv64,$(shell uname -m)))
|
||||
LIBDIR = lib64
|
||||
else
|
||||
LIBDIR = lib
|
||||
@ -1,20 +1,18 @@
|
||||
Name: isomd5sum
|
||||
Version: 1.2.3
|
||||
Release: 8
|
||||
Release: 4
|
||||
Epoch: 1
|
||||
Summary: Utilities for working with md5sum implanted in ISO images
|
||||
License: GPLv2+
|
||||
URL: https://github.com/rhinstaller/isomd5sum
|
||||
Source0: https://github.com/rhinstaller/%{name}/archive/%{version}.tar.gz
|
||||
Patch1: fix-build-error-for-loongarch64.patch
|
||||
Patch2: fix-build-error-for-riscv64.patch
|
||||
|
||||
%global common_description %{expand:
|
||||
isomd5sum provides a way of making use of the ISO9660 application data
|
||||
area to store md5sum data about the iso. This allows you to check the
|
||||
iso given nothing more than the iso itself.}
|
||||
|
||||
BuildRequires: gcc popt-devel python3-devel genisoimage
|
||||
BuildRequires: gcc popt-devel python2-devel python3-devel
|
||||
|
||||
%description
|
||||
%{common_description}
|
||||
@ -27,6 +25,13 @@ Provides: %{name}-static = %{epoch}:%{version}-%{release}
|
||||
%description devel
|
||||
Development headers and libraries for %{name}
|
||||
|
||||
%package -n python2-isomd5sum
|
||||
Summary: Python2 bindings for isomd5sum
|
||||
%{?python_provide:%python_provide python2-isomd5sum}
|
||||
|
||||
%description -n python2-isomd5sum
|
||||
%{common_description}
|
||||
|
||||
%package -n python3-isomd5sum
|
||||
Summary: Python3 bindings for isomd5sum
|
||||
%{?python_provide:%python_provide python3-isomd5sum}
|
||||
@ -39,17 +44,33 @@ Summary: Python3 bindings for isomd5sum
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
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=%{__python3} make DESTDIR=%{buildroot} install-bin install-devel install-python
|
||||
PYTHON=%{__python2} make DESTDIR=%{buildroot} install-bin install-devel install-python
|
||||
|
||||
%check
|
||||
make test
|
||||
pushd %{py3dir}
|
||||
PYTHON=%{__python3} make DESTDIR=%{buildroot} install-bin install-devel install-python
|
||||
popd
|
||||
|
||||
%pre
|
||||
|
||||
%preun
|
||||
|
||||
%post
|
||||
|
||||
%postun
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
@ -60,6 +81,9 @@ make test
|
||||
%{_libdir}/*.a
|
||||
%{_datadir}/pkgconfig/isomd5sum.pc
|
||||
|
||||
%files -n python2-isomd5sum
|
||||
%{python2_sitearch}/*.so
|
||||
|
||||
%files -n python3-isomd5sum
|
||||
%{python3_sitearch}/*.so
|
||||
|
||||
@ -67,18 +91,5 @@ make test
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 20 2023 laokz <zhangkai@iscas.ac.cn> - 1:1.2.3-8
|
||||
- fix build error for riscv64
|
||||
- add %check
|
||||
|
||||
* Wed Jan 11 2023 huajingyun <huajingyun@loongson.cn> - 1:1.2.3-7
|
||||
- fix build error for loongarch64
|
||||
|
||||
* Wed Oct 19 2022 zhangruifang <zhangruifang1@h-partners.com> - 1:1.2.3-6
|
||||
- remove redundant macros
|
||||
|
||||
* Thu Oct 29 2020 wangchen <wangchen137@huawei.com> - 1:1.2.3-5
|
||||
- Remove python2
|
||||
|
||||
* Mon Oct 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:1.2.3-4
|
||||
- Package init
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
version_control: github
|
||||
src_repo: rhinstaller/isomd5sum
|
||||
tag_prefix:
|
||||
seperator:
|
||||
Loading…
x
Reference in New Issue
Block a user