diff --git a/0001-opencsd-build-shared-libraries-should-have-x-set.patch b/0001-opencsd-build-shared-libraries-should-have-x-set.patch deleted file mode 100644 index a4d1418..0000000 --- a/0001-opencsd-build-shared-libraries-should-have-x-set.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 52160df30b3e785d0904ca4380b298e39eded5bb Mon Sep 17 00:00:00 2001 -From: Jeremy Linton -Date: Mon, 6 Jul 2020 18:28:43 -0500 -Subject: [PATCH] opencsd: build: shared libraries should have +x set - -The default install target is installing the .so files -with owner rw, and r for group and owner. This causes ldd -and various packaging utilities to misunderstand that -this is a shared library. - -Signed-off-by: Jeremy Linton ---- - decoder/build/linux/makefile | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile -index 659cf68..05653d5 100644 ---- a/decoder/build/linux/makefile -+++ b/decoder/build/linux/makefile -@@ -118,12 +118,10 @@ install: libs tests - mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_BIN_DIR) - cp -d $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so $(INSTALL_LIB_DIR)/ - cp -d $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so.$(SO_MAJOR_VER) $(INSTALL_LIB_DIR)/ -- $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ -+ $(INSTALL) --mode=755 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ - cp -d $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so $(INSTALL_LIB_DIR)/ - cp -d $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so.$(SO_MAJOR_VER) $(INSTALL_LIB_DIR)/ -- $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ -- $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_BASE_NAME).a $(INSTALL_LIB_DIR)/ -- $(INSTALL) --mode=644 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).a $(INSTALL_LIB_DIR)/ -+ $(INSTALL) --mode=755 $(LIB_TARGET_DIR)/lib$(LIB_CAPI_NAME).so.$(SO_VER) $(INSTALL_LIB_DIR)/ - cd $(OCSD_ROOT)/build/linux/rctdl_c_api_lib && make install_inc - $(INSTALL) --mode=755 $(BIN_TEST_TARGET_DIR)/trc_pkt_lister $(INSTALL_BIN_DIR)/ - --- -2.27.0 - diff --git a/opencsd.spec b/opencsd.spec index 32ff177..f4f3906 100644 --- a/opencsd.spec +++ b/opencsd.spec @@ -1,14 +1,13 @@ -%global opencsd_tag 3fc611aa5d3c9d6a40a88332903cf4230da74ad3 +%global opencsd_tag 957d18219d162f52ebe2426f32a4263ec10f357d Name: opencsd -Version: 0.14.1 -Release: 2%{?dist} +Version: 0.14.3 +Release: 1%{?dist} Summary: An open source CoreSight(tm) Trace Decode library License: BSD URL: https://github.com/Linaro/OpenCSD Source0: https://github.com/Linaro/OpenCSD/archive/%{opencsd_tag}.tar.gz -Patch0: 0001-opencsd-build-shared-libraries-should-have-x-set.patch BuildRequires: patch BuildRequires: gcc @@ -29,7 +28,6 @@ to develop CoreSight(tm) trace decoders. %prep %setup -q -n OpenCSD-%{opencsd_tag} -%patch0 -p1 %build cd decoder/build/linux @@ -40,7 +38,7 @@ LIB_PATH=%{_lib} make %{?_smp_mflags} %install cd decoder/build/linux -PREFIX=%{buildroot}%{_prefix} LIB_PATH=%{_lib} make install +PREFIX=%{buildroot}%{_prefix} LIB_PATH=%{_lib} make install DISABLE_STATIC=1 DEF_SO_PERM=755 %check @@ -60,6 +58,9 @@ PREFIX=%{buildroot}%{_prefix} LIB_PATH=%{_lib} make install #------------------------------------------------------------------------------ %changelog +* Wed Sep 23 2020 Jeremy Linton - 0.14.3-1 +- Update to upstream 0.14.3 + * Tue Jul 28 2020 Fedora Release Engineering - 0.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild