.gitignore

@@ -1,2 +1 @@
-SOURCES/doc-v2.0.4.tar.xz
+SOURCES/v1.6.1.tar.gz
-SOURCES/v2.0.4.tar.gz

.libipt.metadata

@@ -1,2 +1 @@
-77fe11a5169b820b549718c4094a7f46498f449a SOURCES/doc-v2.0.4.tar.xz
+baf2585043db3c165568df877e53de019474962b SOURCES/v1.6.1.tar.gz
-89b3dd85676090dd4a923425f7668446d729f5f3 SOURCES/v2.0.4.tar.gz

SOURCES/libipt-gcc11.patch

@@ -1,22 +0,0 @@
-diff --git a/libipt/test/src/ptunit-msec_cache.c b/libipt/test/src/ptunit-msec_cache.c
-index 68d9daf..cfb059b 100644
---- a/libipt/test/src/ptunit-msec_cache.c
-+++ b/libipt/test/src/ptunit-msec_cache.c
-@@ -296,7 +296,7 @@ static struct ptunit_result read(struct test_fixture *tfix)
- static struct ptunit_result fill_nomap(struct test_fixture *tfix)
- {
- 	const struct pt_mapped_section *msec;
--	struct pt_asid asid;
-+	struct pt_asid asid = { 0 };
- 	struct pt_section *section;
- 	int status;
- 
-@@ -320,7 +320,7 @@ static struct ptunit_result fill(struct test_fixture *tfix)
- {
- 	const struct pt_mapped_section *msec;
- 	struct pt_section *section;
--	struct pt_asid asid;
-+	struct pt_asid asid = { 0 };
- 	int status;
- 
- 	status = pt_msec_cache_fill(&tfix->mcache, &msec, &tfix->image, &asid,

SOURCES/v1.6.1-implicit-fallthrough.patch

@@ -0,0 +1,20 @@
+commit 3a307bd5add3df34665d1e5cb1b646af55ba9653
+Author: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date:   Fri Jun 9 07:27:50 2017 +0200
+
+    libipt: Fix [-Werror=implicit-fallthrough=] with gcc-7.1.1.
+
+diff --git a/libipt/src/pt_block_decoder.c b/libipt/src/pt_block_decoder.c
+index 21783a6..91d5bb3 100644
+--- a/libipt/src/pt_block_decoder.c
++++ b/libipt/src/pt_block_decoder.c
+@@ -2095,6 +2095,9 @@ static int pt_blk_proceed_no_event_cached(struct pt_block_decoder *decoder,
+ 		}
+ 
+ 		/* Fall through to ptbq_decode. */
++#if __GNUC__ >= 7
++		__attribute__ ((fallthrough));
++#endif
+ 
+ 	case ptbq_decode: {
+ 		struct pt_insn_ext iext;

SPECS/libipt.spec

@@ -1,24 +1,14 @@
-# rmpbuild parameters:
-# --with docs: Build pre-generated documentation.
-
-%global __cmake_in_source_build 1
-
 Name: libipt
-Version: 2.0.4
+Version: 1.6.1
-Release: 5%{?dist}
+Release: 8%{?dist}
 Summary: Intel Processor Trace Decoder Library
 License: BSD
-URL: https://github.com/intel/libipt
+URL: https://github.com/01org/processor-trace
-Source0: https://github.com/intel/libipt/archive/v%{version}.tar.gz
+Source0: https://github.com/01org/processor-trace/archive/v%{version}.tar.gz
-Patch0: libipt-gcc11.patch
+Patch1: v1.6.1-implicit-fallthrough.patch
-Source1: doc-v%{version}.tar.xz
 # c++ is required only for -DPTUNIT test "ptunit-cpp".
-BuildRequires: gcc-c++ cmake
-%if 0%{?_with_docs:1}
 # pandoc is for -DMAN.
-BuildRequires: pandoc
+BuildRequires: gcc-c++ cmake pandoc
-%endif
-BuildRequires: make
 ExclusiveArch: %{ix86} x86_64
 
 %description
@@ -38,34 +28,22 @@ The %{name}-devel package contains the header files and libraries needed to
 develop programs that use the Intel Processor Trace (Intel PT) Decoder Library.
 
 %prep
-%setup -q -n libipt-%{version}
+%setup -q -n processor-trace-%{version}
-%patch0 -p1
+%patch1 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DPTUNIT:BOOL=ON \
-%if 0%{?_with_docs:1}
        -DMAN:BOOL=ON \
-%endif
        -DDEVBUILD:BOOL=ON \
        .
-%make_build
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR=%{buildroot}
 %global develdocs howto_libipt.md
 (cd doc;cp -p %{develdocs} ..)
 
-# If not building documentation, copy the pre-generated man pages
-# to the appropriate place. Otherwise, tar up the generated
-# documentation for use in subsequent builds.
-%if 0%{?_with_docs:1}
-(cd $RPM_BUILD_ROOT%{_mandir}/..; %__tar cJf %{SOURCE1} .)
-%else
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-(cd $RPM_BUILD_ROOT%{_mandir}/..; %__tar xJf %{SOURCE1})
-%endif
-
 %check
 ctest -V %{?_smp_mflags}
 
@@ -81,64 +59,6 @@ ctest -V %{?_smp_mflags}
 %{_mandir}/*/*.gz
 
 %changelog
-* Thu Aug 12 2021 Keith Seitz <keiths@redhat.com> - 2.0.4-5
-- Rebuilt for CI verification of 1943531.
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.4-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.4-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Mar 30 2021 Keith Seitz <keiths@redhat.com> - 2.0.4-2
-- Add support for pre-generated documenation, allowing removal
-  of pandoc dependency. (RHBZ 1943531, Keith Seitz)
-
-* Wed Mar 10 2021 Kevin Buettner <kevinb@redhat.com> - 2.0.4-1
-- Release v2.0.4.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Aug 19 2020 Jeff Law <law@redhat.com> - 2.0.2-2
-- Fix uninitialized variable in testsuite
-
-* Tue Aug 04 2020 Keith Seitz <keiths@redhat.com> - 2.0.2-1
-- Upgrade to 2.0.2.
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-6
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 24 2020 Jeff Law <law@redhat.com> - 2.0.1-4
-- Use __cmake_in_source_build
-
-* Wed Jul 22 2020 Tom Stellard <tstellar@redhat.com> - 2.0.1-3
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 16 2019 Sergio Durigan Junior <sergiodj@redhat.com> - 2.0.1-1
-- Release v2.0.1.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Aug  8 2018 Sergio Durigan Junior <sergiodj@redhat.com> - 2.0-1
-- Release v2.0.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Mar  5 2018 Jan Kratochvil <jan.kratochvil@redhat.com> - 1.6.1-8
 - Enable tests (PTUNIT) and man pages (MAN).
 - Change BuildRequires: gcc -> gcc-c++ as PTUNIT tests require C++.