diff --git a/fixed-32-bit-build-with-gcc7.patch b/fixed-32-bit-build-with-gcc7.patch deleted file mode 100644 index 88626d347460ae76558d64bd058cbb2fddbc2d99..0000000000000000000000000000000000000000 --- a/fixed-32-bit-build-with-gcc7.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://src.fedoraproject.org/rpms/hardlink/c/fd6df66282b136bc87cce486c08a199305fa57c3 - ---- a/hardlink.c 2018-11-21 03:44:11.000000000 -0500 -+++ b/hardlink.c 2018-12-28 03:54:51.941515854 -0500 -@@ -66,12 +66,12 @@ - char name[0]; - } f; - --inline unsigned int hash(off_t size, time_t mtime) -+__attribute__((always_inline)) inline unsigned int hash(off_t size, time_t mtime) - { - return (size ^ mtime) & (NHASH - 1); - } - --inline int stcmp(struct stat *st1, struct stat *st2, int content_only) -+__attribute__((always_inline)) inline int stcmp(struct stat *st1, struct stat *st2, int content_only) - { - if (content_only) - return st1->st_size != st2->st_size; -@@ -111,7 +111,7 @@ - unsigned int buf[NBUF]; - char iobuf1[NIOBUF], iobuf2[NIOBUF]; - --inline size_t add2(size_t a, size_t b) -+__attribute__((always_inline)) inline size_t add2(size_t a, size_t b) - { - size_t sum = a + b; - if (sum < a) { -@@ -121,7 +121,7 @@ - return sum; - } - --inline size_t add3(size_t a, size_t b, size_t c) -+__attribute__((always_inline)) inline size_t add3(size_t a, size_t b, size_t c) - { - return add2(add2(a, b), c); - } diff --git a/hardlink.spec b/hardlink.spec index 6727911a5c1cf31a891ace38e21fb03c9774a161..90e8ed7d1961f663412c95be40229ba5f62eec4b 100644 --- a/hardlink.spec +++ b/hardlink.spec @@ -1,6 +1,6 @@ name: hardlink Version: 1.0 -Release: 23 +Release: 24 Epoch: 1 Summary: A tool used to create a tree of hard links License: GPL+ @@ -8,7 +8,6 @@ URL: https://pagure.io/hardlink Source0: hardlink.c Source1: hardlink.1 -Patch6000: fixed-32-bit-build-with-gcc7.patch Obsoletes: kernel-utils %description @@ -47,6 +46,12 @@ install -D -m 755 -t %{buildroot}%{_sbindir} hardlink %{_mandir}/man1/*.gz %changelog +* Tue Dec 31 2019 openEuler Buildteam - 1:1.0-24 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:delete unneeded patch + * Sat Sep 21 2019 openEuler Buildteam - 1:1.0-23 - Type:enhancement - ID:NA