From 7712052492da9d092918e62040a2da9759c126b9 Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@fedoraproject.org>
Date: Dec 05 2024 06:18:42 +0000
Subject: Update to upstream 1.5.5


Signed-off-by: Michel Lind <salimma@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index 53c7efc..62c4f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /c16418833b5d7cbcbcb4e2a2d917ad0147efb2be.tar.gz
 /adb97189b906d524d1c3008e67e4da34aaa0397d.tar.gz
 /7323ae88d16be4f9972b0ad60198963c64d70070.tar.gz
+/opencsd-1.5.5.tar.gz
diff --git a/0001-hack-test.patch b/0001-hack-test.patch
index ae285c5..f113932 100644
--- a/0001-hack-test.patch
+++ b/0001-hack-test.patch
@@ -13,8 +13,6 @@ Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
  decoder/tests/run_pkt_decode_tests.bash | 14 +++-----------
  1 file changed, 3 insertions(+), 11 deletions(-)
 
-diff --git a/decoder/tests/run_pkt_decode_tests.bash b/decoder/tests/run_pkt_decode_tests.bash
-index 30b56f2..4cd2e52 100755
 --- a/decoder/tests/run_pkt_decode_tests.bash
 +++ b/decoder/tests/run_pkt_decode_tests.bash
 @@ -46,6 +46,8 @@
@@ -26,7 +24,7 @@ index 30b56f2..4cd2e52 100755
  OUT_DIR=./results
  SNAPSHOT_DIR=./snapshots
  BIN_DIR=./bin/linux64/rel/
-@@ -73,10 +75,7 @@ echo "Running trc_pkt_lister on snapshot directories."
+@@ -73,10 +75,7 @@ echo "Running trc_pkt_lister on snapshot
  
  mkdir -p ${OUT_DIR}
  
@@ -51,7 +49,7 @@ index 30b56f2..4cd2e52 100755
  for test_dir in "${test_dirs_decode[@]}"
  do
 @@ -105,7 +99,6 @@ env | grep OPENCSD
- ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -logfilename "${OUT_DIR}/juno_r1_1_rangelimit.ppl"
+ ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -no_time_print -logfilename "${OUT_DIR}/juno_r1_1_rangelimit.ppl"
  unset OPENCSD_INSTR_RANGE_LIMIT
  echo "Done : Return $?"
 -env | grep OPENCSD
@@ -59,13 +57,10 @@ index 30b56f2..4cd2e52 100755
  echo "Test with bad opcode detect on using env var..."
  export OPENCSD_ERR_ON_AA64_BAD_OPCODE=1
 @@ -113,7 +106,6 @@ env | grep OPENCSD
- ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -logfilename "${OUT_DIR}/juno_r1_1_badopcode.ppl"
+ ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -no_time_print -logfilename "${OUT_DIR}/juno_r1_1_badopcode.ppl"
  unset OPENCSD_ERR_ON_AA64_BAD_OPCODE
  echo "Done : Return $?"
 -env | grep OPENCSD
  
  echo "Test with bad opcode detect on using flag..."
- ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -aa64_opcode_chk -logfilename "${OUT_DIR}/juno_r1_1_badopcode_flag.ppl"
--- 
-2.46.0
-
+ ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/juno_r1_1" $@ -decode -no_time_print -aa64_opcode_chk -logfilename "${OUT_DIR}/juno_r1_1_badopcode_flag.ppl"
diff --git a/opencsd.spec b/opencsd.spec
index 8b4095f..7efe8da 100644
--- a/opencsd.spec
+++ b/opencsd.spec
@@ -1,13 +1,11 @@
-%global opencsd_tag 7323ae88d16be4f9972b0ad60198963c64d70070
-
 Name:           opencsd
-Version:        1.5.4
-Release:        0%{?dist}
+Version:        1.5.5
+Release:        1%{?dist}
 Summary:        An open source CoreSight(tm) Trace Decode library
 
 License:        BSD-3-Clause
 URL:            https://github.com/Linaro/OpenCSD
-Source0:        https://github.com/Linaro/OpenCSD/archive/%{opencsd_tag}.tar.gz
+Source:         %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 Patch0:         0001-hack-test.patch
 
@@ -28,9 +26,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 The opencsd-devel package contains headers and libraries needed
 to develop CoreSight(tm) trace decoders.
 
+
 %prep
-%setup -q -n OpenCSD-%{opencsd_tag}
-%patch -P0 -p1
+%autosetup -p1 -n OpenCSD-%{version}
+
 
 %build
 cd decoder/build/linux
@@ -62,6 +61,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} decoder/tests/run_pkt_decode_tests.bash -
 
 #------------------------------------------------------------------------------
 %changelog
+* Wed Dec 04 2024 Michel Lind <salimma@fedoraproject.org> - 1.5.5-1
+- Update to upstream 1.5.5
+
 * Thu Aug 29 2024 Jeremy Linton <jeremy.linton@arm.com> - 1.5.4-0
 - Update to upstream 1.5.4
 
diff --git a/sources b/sources
index ae4c1aa..0fe32d4 100644
--- a/sources
+++ b/sources
@@ -1,12 +1 @@
-SHA512 (9353f9ce57d417fe8cd2ace80106eb05691537ff.tar.gz) = 3449e8d431c8554c91debbe1fd76e47adab4605e3b3ff285df41006bd62c95d00b9276d493b9199a995712886b219e182edfcd303806cc336d4e8a625eff88b7
-SHA512 (01d44a34f8fc057f4b041c01f8d9502d77fe612f.tar.gz) = 607779390c7c60c138fe8a062e89122f45581af76635437bd187e445d3eab1dafbf51996e14be09160f2b3b93be463d71708ce395473b7d2813f27a8a8efa6f1
-SHA512 (dac554d62d514b202174506995afc0e109ef3fea.tar.gz) = cd7e0a2a2afa8d0de6478bc789d3719fb04a80c07a68a79bc914b0bd34b2ecbe5582cced40b543e2d14780c7034cc37bb3c34eb8642ef26abad39bce8a861e9e
-SHA512 (fcc76f3925d98e49e77fdc86d75a7715e420d2b8.tar.gz) = 395ac8ef00987fd99af950386d7ba4e774e785ee4e2ae704f8584c8e24d945ae458d88ab9403fcb16557d82f08230fd93bbf2fa48f2719c16ab565a73326ff6c
-SHA512 (8dab50c35c8d181fc3ed6ad46e156398447d753f.tar.gz) = dd858bd9a5d595a30363bd985c3b801b18a3646fc3eedbdff09345648efb85348a8637eabec28126526e7c9e32356c3a299fbf40fc66d6f3118dde8557829875
-SHA512 (a74fa026d7101f5f254f39bbaa27b3d5ab9cd124.tar.gz) = db050bf5668ba53afd86bad87fcc8c9d433092a7e616ced493a04209a69aa88336fe1f6d07f5b18968ea234161e8f49123c1a600ae16bf8f27af017aa3058a71
-SHA512 (691efce6ab357a35d16eb719498ca9aec72885d5.tar.gz) = df65bbcc536d5695cbab95427741da9e3f41b7f865def59fef0bd7351a382d1f97c55bc67877c592fe0395e90ba88fdce7c1c2ee80e40756629f05fb0e5adde7
-SHA512 (78ce8ef47c55a489b0ca575b981cd4856d03f44b.tar.gz) = aad97b74aebf1e38beeac59292f603eab273077baf3802c51e3d8763a83ca7f67e34a27b48ecf09c122fb2646ac5ebe3892f78eadcd8dc015fc2ce2c7eb582d4
-SHA512 (553d74524332be146675980ef611153d1a1ab6f8.tar.gz) = a64d149cb5d3822e159effd60fbcab9892c6d3985367efcef2691617aa056204e88b18edc195a82a6d4bce5fffc23db43ace5297f543b0cd0c81f994a47f069d
-SHA512 (c16418833b5d7cbcbcb4e2a2d917ad0147efb2be.tar.gz) = 14cac190ca7196017fc40a9a57ccc5af621ce02add24d1303495c47237a2cbcf7685e0123f6f61c0316cf6f29f198b570faa29de1ca85f24f1e8fae3732b8284
-SHA512 (adb97189b906d524d1c3008e67e4da34aaa0397d.tar.gz) = 81e71ba66cf53bd47493fd0e7d43782fd0790592c4cd3bf66acec201c8ff0d06797a8c67484ee1f3ee4a3a570d16ac612d9819c154638baa34e8738ad594ee4d
-SHA512 (7323ae88d16be4f9972b0ad60198963c64d70070.tar.gz) = 4579c89330e7df156245c2708d5e6b3bd77484a1df7008090f88680d1ab96ed9ce2bbcf64849ebef1199763a4828f195922af41c6b5b0e63ee1a3e7e98a2bd0c
+SHA512 (opencsd-1.5.5.tar.gz) = 0e4c293fd17a3a3bcd61d731ce1be1cb31bc71e0923a2690557c518d40673af819117b33995192afcd71263f4ef647164b4f1b55fe5370be7dfaf1f6ec2f3ae7