!17 upgrade to version 4.6.0

From: @lakers1023 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001

intel-cmt-cat.spec

@@ -1,122 +1,185 @@
+# Copyright (c) 2016-2020, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of Intel Corporation nor the names of its contributors
+#       may be used to endorse or promote products derived from this software
+#       without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+%global githubname   intel-cmt-cat
+%global githubver    4.6.0
+
+%if %{defined githubsubver}
+%global githubfull   %{githubname}-%{githubver}.%{githubsubver}
+%else
+%global githubfull   %{githubname}-%{githubver}
+%endif
+
+# disable producing debuginfo for this package
 %global debug_package %{nil}
 
-Name:               intel-cmt-cat
-Summary:            B support for Intel(R) Resource Director Technology(Intel(R) RDT)
-Version:            2.0.0
-Release:            3
-License:            BSD
-URL:                https://github.com/01org/%{name}
-Source:             https://github.com/01org/%{name}/archive/v%{version}.tar.gz
 
+Summary:            Provides command line interface to CMT, MBM, CAT, CDP and MBA technologies
+Name:               %{githubname}
+Release:            1
+Version:            %{githubver}
+License:            BSD
 ExclusiveArch:      x86_64 i686 i586
-BuildRequires:      gcc make
+%if %{defined githubsubver}
+Source:             https://github.com/01org/%{githubname}/archive/v%{githubver}.%{githubsubver}.tar.gz
+%else
+Source:             https://github.com/01org/%{githubname}/archive/v%{githubver}.tar.gz
+%endif
+URL:                https://github.com/01org/%{githubname}
+BuildRequires:      gcc, make
 
 %description
 This software package provides basic support for
-Intel(R) Resource Director Technology (Intel(R) RDT) including:
 Cache Monitoring Technology (CMT), Memory Bandwidth Monitoring (MBM),
-Cache Allocation Technology (CAT), Code and Data Prioritization (CDP)
+Cache Allocation Technology (CAT), Memory Bandwidth Allocation (MBA),
-and Memory Bandwidth Allocation (MBA).
+and Code Data Prioratization (CDP).
 
-%package            devel
+CMT, MBM and CAT are configured using Model Specific Registers (MSRs)
-Summary:            Development files for %{name}
+to measure last level cache occupancy, set up the class of service masks and
+manage the association of the cores/logical threads to a class of service.
+The software executes in user space, and access to the MSRs is
+obtained through a standard Linux* interface. The virtual file system
+provides an interface to read and write the MSR registers but
+it requires root privileges.
+
+%package -n intel-cmt-cat-devel
+Summary:            Library and sample code to use CMT, MBM, CAT, CDP and MBA technologies
 License:            BSD
-Requires:           intel-cmt-cat = %{version}
+Requires:           intel-cmt-cat == %{version}
 ExclusiveArch:      x86_64 i686 i586
 
-%description        devel
+%description -n intel-cmt-cat-devel
-Development files for %{name}
+This software package provides basic support for
+Cache Monitoring Technology (CMT), Memory Bandwidth Monitoring (MBM),
+Cache Allocation Technology (CAT), Memory Bandwidth Allocation (MBA),
+and Code Data Prioratization (CDP).
+The package includes library, header file and sample code.
 
-%package_help
+For additional information please refer to:
+https://github.com/01org/%{githubname}
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{githubfull}
+
+%ldconfig_scriptlets
 
 %build
-%make_build
+make %{?_smp_mflags}
 
 %install
+# Not doing make install as it strips the symbols.
+# Using files from the build directory.
 install -d %{buildroot}/%{_bindir}
-install -s %{_builddir}/%{name}-%{version}/pqos/pqos %{buildroot}/%{_bindir}
+install -s %{_builddir}/%{githubfull}/pqos/pqos %{buildroot}/%{_bindir}
-install %{_builddir}/%{name}-%{version}/pqos/pqos-os %{buildroot}/%{_bindir}
+install %{_builddir}/%{githubfull}/pqos/pqos-os %{buildroot}/%{_bindir}
-install %{_builddir}/%{name}-%{version}/pqos/pqos-msr %{buildroot}/%{_bindir}
+install %{_builddir}/%{githubfull}/pqos/pqos-msr %{buildroot}/%{_bindir}
 sed -i "1s/.*/\#!\/usr\/bin\/bash/" %{buildroot}/%{_bindir}/pqos-*
 
 install -d %{buildroot}/%{_mandir}/man8
-install -m 0644 %{_builddir}/%{name}-%{version}/pqos/pqos.8  %{buildroot}/%{_mandir}/man8
+install -m 0644 %{_builddir}/%{githubfull}/pqos/pqos.8  %{buildroot}/%{_mandir}/man8
 ln -sf %{_mandir}/man8/pqos.8 %{buildroot}/%{_mandir}/man8/pqos-os.8
 ln -sf %{_mandir}/man8/pqos.8 %{buildroot}/%{_mandir}/man8/pqos-msr.8
 
 install -d %{buildroot}/%{_bindir}
-install -s %{_builddir}/%{name}-%{version}/rdtset/rdtset %{buildroot}/%{_bindir}
+install -s %{_builddir}/%{githubfull}/rdtset/rdtset %{buildroot}/%{_bindir}
 
 install -d %{buildroot}/%{_mandir}/man8
-install -m 0644 %{_builddir}/%{name}-%{version}/rdtset/rdtset.8  %{buildroot}/%{_mandir}/man8
+install -m 0644 %{_builddir}/%{githubfull}/rdtset/rdtset.8  %{buildroot}/%{_mandir}/man8
 
 install -d %{buildroot}/%{_licensedir}/%{name}-%{version}
-install -m 0644 %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/%{_licensedir}/%{name}-%{version}
+install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_licensedir}/%{name}-%{version}
 
+# Install the library
 install -d %{buildroot}/%{_libdir}
-install -s %{_builddir}/%{name}-%{version}/lib/libpqos.so.* %{buildroot}/%{_libdir}
+install -s %{_builddir}/%{githubfull}/lib/libpqos.so.* %{buildroot}/%{_libdir}
-cp -a %{_builddir}/%{name}-%{version}/lib/libpqos.so %{buildroot}/%{_libdir}
+cp -a %{_builddir}/%{githubfull}/lib/libpqos.so %{buildroot}/%{_libdir}
-cp -a %{_builddir}/%{name}-%{version}/lib/libpqos.so.2 %{buildroot}/%{_libdir}
+cp -a %{_builddir}/%{githubfull}/lib/libpqos.so.4 %{buildroot}/%{_libdir}
 
+# Install the header file
 install -d %{buildroot}/%{_includedir}
-install -m 0644 %{_builddir}/%{name}-%{version}/lib/pqos.h %{buildroot}/%{_includedir}
+install -m 0644 %{_builddir}/%{githubfull}/lib/pqos.h %{buildroot}/%{_includedir}
 
-install -d %{buildroot}/%{_usrsrc}/%{name}-%{version}
+# Install license and sample code
-install -m 0644 %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/%{_usrsrc}/%{name}-%{version}
+install -d %{buildroot}/%{_usrsrc}/%{githubfull}
+install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_usrsrc}/%{githubfull}
 
-install -d %{buildroot}/%{_usrsrc}/%{name}-%{version}/c
+install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c
 
-install -d %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CAT
+install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
-install -m 0644 %{_builddir}/%{name}-%{version}/examples/c/CAT/Makefile          %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CAT
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/Makefile          %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
-install -m 0644 %{_builddir}/%{name}-%{version}/examples/c/CAT/reset_app.c       %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CAT
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/reset_app.c       %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
-install -m 0644 %{_builddir}/%{name}-%{version}/examples/c/CAT/allocation_app.c  %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CAT
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/allocation_app_l2cat.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
-install -m 0644 %{_builddir}/%{name}-%{version}/examples/c/CAT/association_app.c %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CAT
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/allocation_app_l3cat.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/allocation_app_mba.c  %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT_MBA/association_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT_MBA
 
-install -d %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CMT_MBM
+install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM
-install -m 0644 %{_builddir}/%{name}-%{version}/examples/c/CMT_MBM/Makefile      %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CMT_MBM
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CMT_MBM/Makefile      %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM
-install -m 0644 %{_builddir}/%{name}-%{version}/examples/c/CMT_MBM/monitor_app.c %{buildroot}/%{_usrsrc}/%{name}-%{version}/c/CMT_MBM
+install -m 0644 %{_builddir}/%{githubfull}/examples/c/CMT_MBM/monitor_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM
-
-%pre
-
-%post
-/sbin/ldconfig
-
-%preun
-
-%postun
-/sbin/ldconfig
 
 %files
-%{!?_licensedir:%global license %%doc}
-%license %{_licensedir}/%{name}-%{version}/LICENSE
-%doc ChangeLog README
 %{_bindir}/pqos
 %{_bindir}/pqos-os
 %{_bindir}/pqos-msr
-%{_bindir}/rdtset
-%{_libdir}/libpqos.so.*
-
-%files devel
-%{_libdir}/libpqos.so
-%{_libdir}/libpqos.so.2
-%{_includedir}/pqos.h
-%{_usrsrc}/%{name}-%{version}/c/CAT/Makefile
-%{_usrsrc}/%{name}-%{version}/c/CAT/reset_app.c
-%{_usrsrc}/%{name}-%{version}/c/CAT/association_app.c
-%{_usrsrc}/%{name}-%{version}/c/CAT/allocation_app.c
-%{_usrsrc}/%{name}-%{version}/c/CMT_MBM/Makefile
-%{_usrsrc}/%{name}-%{version}/c/CMT_MBM/monitor_app.c
-%doc %{_usrsrc}/%{name}-%{version}/LICENSE
-
-%files help
 %{_mandir}/man8/pqos.8.gz
 %{_mandir}/man8/pqos-os.8.gz
 %{_mandir}/man8/pqos-msr.8.gz
+%{_bindir}/rdtset
 %{_mandir}/man8/rdtset.8.gz
+%{_libdir}/libpqos.so.*
+
+%{!?_licensedir:%global license %%doc}
+%license %{_licensedir}/%{name}-%{version}/LICENSE
+%doc ChangeLog README.md
+
+%files -n intel-cmt-cat-devel
+%{_libdir}/libpqos.so
+%{_libdir}/libpqos.so.4
+%{_includedir}/pqos.h
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/Makefile
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/reset_app.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/association_app.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/allocation_app_l2cat.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/allocation_app_l3cat.c
+%{_usrsrc}/%{githubfull}/c/CAT_MBA/allocation_app_mba.c
+%{_usrsrc}/%{githubfull}/c/CMT_MBM/Makefile
+%{_usrsrc}/%{githubfull}/c/CMT_MBM/monitor_app.c
+%doc %{_usrsrc}/%{githubfull}/LICENSE
 
 %changelog
+* Wed Aug 9 2023 shangjiwei <cyrus_shang@163.com> - 4.6.0-1
+- upgrade to version 4.6.0
+
+* Fri Jun 16 2023 chenchen <chen_aka_jan@163.com> - 4.5.0-1
+- Upgrade to version 4.5.0
+
+* Mon Dec 13  2021 liweigang <liweiganga@uniontech.com> - 4.1.0-3
+- delete %dist
+
+* Mon Aug 2  2021 Liushaofei <Liushaofei5@huawei.com> - 4.1.0-2
+- upgrade intel-cmt-cat version
+
 * Tue Dec 10 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.0.0-3
 - Package init

intel-cmt-cat.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo:  intel/intel-cmt-cat
+tag_prefix: ^v
+seperator: .