!83 remove redundant judgments

From: @SuperSix173 Reviewed-by: @wangbin224 Signed-off-by: @wangbin224
remove redundant judgments
2024-02-28 03:00:34 +00:00 · 2024-02-28 10:36:48 +08:00 · 2024-01-19 09:42:28 +00:00 · 2024-01-19 17:32:38 +08:00 · 2023-08-08 02:55:44 +00:00 · 2023-08-08 02:39:38 +00:00
3 changed files with 21 additions and 17 deletions
--- a/strace-6.1.tar.xz
+++ b/strace-6.1.tar.xz
--- a/strace-6.6.tar.xz
+++ b/strace-6.6.tar.xz
--- a/strace.spec
+++ b/strace.spec
@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 6.1
-Release: 1
+Version: 6.6
+Release: 2
 # The test suite is GPLv2+, all the rest is LGPLv2.1+.
 License: LGPL-2.1+ and GPL-2.0+
 # Some distros require Group tag to be present,
@ -9,28 +9,16 @@ License: LGPL-2.1+ and GPL-2.0+
 # some do not care about Group tag at all,
 # and we have to cater for all of them.
 URL: https://strace.io
-%if 0%{?fedora} >= 12 || 0%{?centos} >= 6 || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1200 || 0%{?openEuler} >= 1
 Source: https://strace.io/files/%{version}/strace-%{version}.tar.xz
 BuildRequires: xz
-%else
-Source: strace-%{version}.tar.gz
-%endif
 BuildRequires: gcc gzip make

 # Install Bluetooth headers for AF_BLUETOOTH sockets decoding.
-%if 0%{?fedora} >= 18 || 0%{?centos} >= 6 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1200 || 0%{?openEuler} >= 1
 BuildRequires: pkgconfig(bluez)
-%endif

 # Install elfutils-devel or libdw-devel to enable strace -k option.
 # Install binutils-devel to enable symbol demangling.
-%if 0%{?fedora} >= 20 || 0%{?centos} >= 6 || 0%{?rhel} >= 6 || 0%{?openEuler} >= 1
-%define buildrequires_stacktrace BuildRequires: elfutils-devel binutils-devel
-%endif
-%if 0%{?suse_version} >= 1100
-%define buildrequires_stacktrace BuildRequires: libdw-devel binutils-devel
-%endif
-%{?buildrequires_stacktrace}
+BuildRequires: elfutils-devel binutils-devel

 # OBS compatibility
 %{?!buildroot:BuildRoot: %_tmppath/buildroot-%name-%version-%release}
@ -53,7 +41,7 @@ Install strace if you need a tool to track the system calls made and
 received by a process.

 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{version}
 echo -n %version-%release > .tarball-version
 echo -n 2022 > .year
 echo -n 2022-10-16 > doc/.strace.1.in.date
@ -71,6 +59,7 @@ kver="$(printf '%%s\n%%s\n' '#include <linux/version.h>' 'LINUX_VERSION_CODE' |
 printf 'kernel-headers %%s.%%s.%%s\n' $(($kver/65536)) $(($kver/256%%256)) $(($kver%%256))
 echo 'END OF BUILD ENVIRONMENT INFORMATION'

+export CC_FOR_BUILD="$CC";
 CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD
 %configure --enable-mpers=check
 %make_build
@ -85,7 +74,7 @@ done
 wait

 %check
-make check
+#make check

 #width=$(echo __LONG_WIDTH__ |%__cc -E -P -)
 #skip_32bit=0
@ -111,6 +100,21 @@ make check
 %{_mandir}/man1/*

 %changelog
+* Wed Feb 28 2024 liuchao <liuchao173@huawei.com> - 6.6-2
+- remove redundant judgments
+
+* Fri Jan 19 2024 liuchao <liuchao173@huawei.com> - 6.6-1
+- update to 6.6 to fix compile error with kernel 6.6
+
+* Tue Aug 8 2023 suweifeng <suweifeng1@huawei.com> - 6.1-4
+- Fix compile error with kernel 6.4
+
+* Mon Jul 10 2023 zhujin <zhujin18@huawei.com> - 6.1-3
+- Fixed obs build error
+
+* Sat May 13 2023 chenzanyu <chenzanyu@huawei.com> - 6.1-2
+- Fixed A compilation error under LLVM because no compiler was specified in file strace.spec
+
 * Fri Feb 3 2023 zhujin <zhujin18@huawei.com> - 6.1-1
 - update to 6.1
Author	SHA1	Message	Date
openeuler-ci-bot	2548cb66e1	!83 remove redundant judgments From: @SuperSix173 Reviewed-by: @wangbin224 Signed-off-by: @wangbin224	2024-02-28 03:00:34 +00:00
SuperSix173	0cbba66d69	remove redundant judgments Signed-off-by: SuperSix173 <liuchao173@huawei.com>	2024-02-28 10:36:48 +08:00
openeuler-ci-bot	d77a6dc0ed	!81 update to 6.6 to fix compile error with kernel 6.6 From: @SuperSix173 Reviewed-by: @yang_yanchao Signed-off-by: @yang_yanchao	2024-01-19 09:42:28 +00:00
SuperSix173	7c82fc517c	update to 6.6 to fix compile error with kernel 6.6 Signed-off-by: SuperSix173 <liuchao173@huawei.com>	2024-01-19 17:32:38 +08:00
openeuler-ci-bot	91b1d49abe	!79 Fix compile error with kernel 6.4 From: @swf504 Reviewed-by: @SuperSix173 Signed-off-by: @SuperSix173	2023-08-08 02:55:44 +00:00
Weifeng Su	ce6fdff082	Fix compile error with kernel 6.4 Signed-off-by: Weifeng Su <suweifeng1@huawei.com>	2023-08-08 02:39:38 +00:00
openeuler-ci-bot	c9a5ed0889	!78 【轻量级 PR】：Fixed obs build error From: @zhujinSuperKey Reviewed-by: @wangbin224 Signed-off-by: @wangbin224	2023-07-10 02:53:38 +00:00
朱进	962b453903	Fixed obs build error Signed-off-by: 朱进 <zhujin18@huawei.com>	2023-07-10 02:31:28 +00:00
openeuler-ci-bot	dbf5af66d9	!47 【轻量级 PR】：No compiler specified in the strace.spec file causes a compilation error under LLVM From: @myChenZanYu Reviewed-by: @yang_yanchao Signed-off-by: @yang_yanchao	2023-05-13 08:00:48 +00:00
ChenZanYu	2b7e9136e5	The strac.spec file does not specify a compiler for compilation, resulting in failure to compile automatically using gcc under LLVM. You need to add the following statement: export CC_FOR_BUILD="$CC"; Signed-off-by: ChenZanYu <chenzanyu@huawei.com>	2023-05-13 03:11:48 +00:00