diff --git a/ipmctl-01.00.00.3102.tar.gz b/ipmctl-01.00.00.3102.tar.gz new file mode 100644 index 0000000..074ce68 --- /dev/null +++ b/ipmctl-01.00.00.3102.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:116d67cb3078d301c37dd92ce14d1e5d97bf1f279753f5b6861bef3c3fca4ffd +size 10342671 diff --git a/ipmctl-fix-SLE12-build.patch b/ipmctl-fix-SLE12-build.patch index 99e2d97..254f4bb 100644 --- a/ipmctl-fix-SLE12-build.patch +++ b/ipmctl-fix-SLE12-build.patch @@ -1,18 +1,19 @@ ---- ipmctl-01.00.00.3091.v.d/CMakeLists.txt 2018-05-30 01:54:48.000000000 +0200 -+++ ipmctl-01.00.00.3091.tar.d/CMakeLists.txt 2018-06-08 21:25:25.000000000 +0200 -@@ -113,9 +113,12 @@ +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,10 +113,10 @@ if(LNX_BUILD) -D_GNU_SOURCE -D__LINUX__ ) -- -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") +- if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8) + if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.9) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") -+ endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong") + endif() +- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") -+ endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") + endif() endif() - - #---------------------------------------------------------------------------------------------------- diff --git a/ipmctl.rpmlintrc b/ipmctl-rpmlintrc similarity index 100% rename from ipmctl.rpmlintrc rename to ipmctl-rpmlintrc diff --git a/ipmctl.changes b/ipmctl.changes index 70034e9..4f9f3af 100644 --- a/ipmctl.changes +++ b/ipmctl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 10 15:28:34 UTC 2018 - rw@suse.com + +- Update to v01.00.00.3102. [FATE#325527] + (Last release without "safec" dependency.) +- Refresh ipmctl-fix-SLE12-build.patch. +- Incorporate spec-file improvements proposed by mpluskal. + ------------------------------------------------------------------- Sun Jul 29 10:41:39 UTC 2018 - jengelh@inai.de diff --git a/ipmctl.spec b/ipmctl.spec index afa1eee..b33b1bf 100644 --- a/ipmctl.spec +++ b/ipmctl.spec @@ -15,27 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define _unpackaged_files_terminate_build 1 - Name: ipmctl -Version: 01.00.00.3091 -Release: 1%{?dist} +Version: 01.00.00.3102 +Release: 0 Summary: Utility for managing Intel Optane DC persistent memory modules License: BSD-3-Clause Group: System/Management -Url: https://github.com/intel/ipmctl -Source: https://github.com/intel/ipmctl/archive/v%{version}.tar.gz -Source1: %{name}.rpmlintrc +URL: https://github.com/intel/ipmctl +Source: https://github.com/intel/ipmctl/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source1: %{name}-rpmlintrc Patch1: ipmctl-fix-SLE12-build.patch -ExclusiveArch: x86_64 Requires: libipmctl2%{?_isa} = %{version}-%{release} BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: python2 +BuildRequires: pkgconfig BuildRequires: pkgconfig(libndctl) +BuildRequires: systemd +BuildRequires: systemd-rpm-macros Obsoletes: ixpdimm-cli < 01.00.00.3000 +ExclusiveArch: x86_64 %description Utility for managing Intel Optane DC persistent memory modules @@ -55,10 +55,8 @@ Supports functionality to: %package -n ipmctl-monitor Summary: Daemon for monitoring the status of Intel PMM Group: System/Monitoring -Requires: libipmctl2%{?_isa} = %{version}-%{release} +Conflicts: libipmctl2%{?_isa} < %{version}-%{release} %{?systemd_requires} -BuildRequires: systemd -BuildRequires: systemd-rpm-macros Obsoletes: ixpdimm-monitor < 01.00.00.3000 %description -n ipmctl-monitor @@ -67,7 +65,7 @@ A monitor daemon for monitoring the health and status of Intel Optane DC persist %package -n libipmctl2 Summary: Library for Intel PMM management Group: System/Libraries -Requires: libndctl6 >= 58.2 +Requires: %{name}-data Obsoletes: ixpdimm-data < 01.00.00.3000 Obsoletes: ixpdimm_sw < 01.00.00.3000 Obsoletes: libixpdimm < 01.00.00.3000 @@ -79,14 +77,21 @@ Obsoletes: libixpdimm-core < 01.00.00.3000 %description -n libipmctl2 An Application Programming Interface (API) library for managing Intel Optane DC persistent memory modules. -%package -n libipmctl-devel +%package -n %{name}-data +Summary: Data files for %{name} +Group: System/Libraries + +%description -n ipmctl-data +Non-versioned files for libipmctl2. + +%package -n ipmctl-devel Summary: Development packages for libipmctl Group: Development/Libraries/C and C++ -Requires: libipmctl2%{?_isa} = %{version}-%{release} +Requires: libipmctl2 = %{version} Obsoletes: ixpdimm-devel < 01.00.00.3000 Obsoletes: ixpdimm_sw-devel < 01.00.00.3000 -%description -n libipmctl-devel +%description -n ipmctl-devel API for development of Intel Optane DC persistent memory management utilities. %build @@ -102,11 +107,10 @@ API for development of Intel Optane DC persistent memory management utilities. -DINSTALL_UNITDIR=%{_unitdir} \ -DRELEASE=ON \ -DRPM_BUILD=ON -make -f Makefile %{?_smp_mflags} +%make_jobs %install -%{!?_cmake_version: cd build} -make -f Makefile install DESTDIR=%{buildroot} +%cmake_install mkdir -p %{buildroot}%{_sbindir} ln -sf service %{buildroot}%{_sbindir}/rcipmctl-monitor @@ -126,7 +130,7 @@ ln -sf service %{buildroot}%{_sbindir}/rcipmctl-monitor %postun -n ipmctl-monitor %service_del_postun ipmctl-monitor.service -%files -n ipmctl +%files %defattr(-,root,root) %license LICENSE %{_bindir}/ipmctl @@ -140,14 +144,16 @@ ln -sf service %{buildroot}%{_sbindir}/rcipmctl-monitor %files -n libipmctl2 %defattr(-,root,root) -%license LICENSE %{_libdir}/libipmctl.so.* + +%files -n %{name}-data +%defattr(-,root,root) %dir %{_datadir}/doc/ipmctl %doc %{_datadir}/doc/ipmctl/ipmctl_default.conf %config %{_sysconfdir}/ipmctl.conf %dir %attr(644,root,root) %{_localstatedir}/log/ipmctl -%files -n libipmctl-devel +%files -n ipmctl-devel %defattr(-,root,root) %doc README.md %{_libdir}/libipmctl.so diff --git a/v01.00.00.3091.tar.gz b/v01.00.00.3091.tar.gz deleted file mode 100644 index 918e0c8..0000000 --- a/v01.00.00.3091.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a65cbfae1fec644c4c6e256abba06e2783e6b0563c8d1d812eb430235534fc9 -size 10337455