diff --git a/.gitignore b/.gitignore index cb519b3..550c9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /easylzma-0.0.7.tar.gz /zmat-0.9.2.tar.gz +/zmat-0.9.8.tar.gz diff --git a/sources b/sources index 844602a..462b99c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (easylzma-0.0.7.tar.gz) = 23bc2b6b88ae3bea389a04319effdf129477fed302ee719b9fadc7db1a79eec8c54fe9971e4d88dbbfb552371ce1dd308636f0e7fad2343a6cf26736c3261103 -SHA512 (zmat-0.9.2.tar.gz) = 5ef735f0d25598b9b9b1d7adf7f2cf7f71503178d471f41e7ed46c6e4d6ea897b774f8fb0001a4a3608afb3bfc84f0a1bc50357217de5a04fa8ecbeb230609c8 +SHA512 (zmat-0.9.8.tar.gz) = b738ffa0d0e5b3a9efc8bd9899157480c7e0e99e23e89763df006977b9ba27d08fa69a209a36d7b1a62346d07000a585d22f89b1e6f7c5aaca532d169542b48a diff --git a/zmat.spec b/zmat.spec index 1574249..089ca8b 100644 --- a/zmat.spec +++ b/zmat.spec @@ -1,12 +1,13 @@ Name: zmat -Version: 0.9.2 -Release: 1%{?dist} +Version: 0.9.8 +Release: 16%{?dist} Summary: An easy-to-use data compression library -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: https://github.com/fangq/%{name} Source0: https://github.com/fangq/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/lloyd/easylzma/archive/0.0.7/easylzma-0.0.7.tar.gz -BuildRequires: cmake gcc-c++ zlib-devel +BuildRequires: make +BuildRequires: gcc-c++ zlib-devel %description ZMat is a portable C library to enable easy-to-use data compression @@ -22,7 +23,7 @@ between speed and compression time. %package devel Summary: Development files for zmat - an easy-to-use data compression library Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: lz4-devel +Requires: zlib-devel %description devel The %{name}-devel package provides the headers files and tools you may need to @@ -38,43 +39,29 @@ The %{name}-static package provides the static library you may need to develop applications using zmat. %prep -%autosetup -n %{name}-%{version} -b 1 -rm -rf src/easylzma -cp -r ../easylzma-0.0.7 src/easylzma - +%autosetup -n %{name}-%{version} +chmod a-x src/easylzma/pavlov/* +mv test examples %build %set_build_flags -mkdir lib -mkdir include -pushd src -pushd easylzma -%cmake . -%make_build -mv easylzma-0.0.7 easylzma-0.0.8 -cp -r easylzma-0.0.8/include/easylzma ../../include -popd -popd +mv fortran90/%{name}lib.f90 include/ pushd src %make_build clean -%make_build lib BINARY=lib%{name}.a CPPOPT="%{optflags} -fPIC" -cp ../lib%{name}.a ../lib/ -cp zmatlib.h ../include +%make_build lib CPPOPT="%{optflags} -fPIC" +mv ../lib/lib%{name}.a ../ %make_build clean -%make_build dll BINARY=lib%{name}.so CPPOPT="%{optflags} -fPIC" -mv ../lib%{name}.so ../lib/lib%{name}.so.%{version} +%make_build dll CPPOPT="%{optflags} -fPIC" +mv ../lib/lib%{name}.so ../lib/lib%{name}.so.%{version} +mv ../lib%{name}.a ../lib popd %install install -m 755 -pd %{buildroot}/%{_includedir}/ install -m 644 -pt %{buildroot}/%{_includedir}/ include/%{name}lib.h - -install -m 755 -pd %{buildroot}/%{_includedir}/easylzma -install -m 644 -pt %{buildroot}/%{_includedir}/easylzma include/easylzma/common.h -install -m 644 -pt %{buildroot}/%{_includedir}/easylzma include/easylzma/compress.h -install -m 644 -pt %{buildroot}/%{_includedir}/easylzma include/easylzma/decompress.h +install -m 644 -pt %{buildroot}/%{_includedir}/ include/%{name}lib.f90 install -m 755 -pd %{buildroot}/%{_libdir}/ install -m 755 -pt %{buildroot}/%{_libdir}/ lib/lib%{name}.so.%{version} @@ -93,11 +80,9 @@ popd %{_libdir}/lib%{name}.so.1 %files devel -%dir %{_includedir}/easylzma +%doc examples %{_includedir}/%{name}lib.h -%{_includedir}/easylzma/common.h -%{_includedir}/easylzma/compress.h -%{_includedir}/easylzma/decompress.h +%{_includedir}/%{name}lib.f90 %{_libdir}/lib%{name}.so %files static @@ -105,5 +90,57 @@ popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.8-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.9.8-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 0.9.8-14 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.9.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.9.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.9.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.9.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.9.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 0.9.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 29 2020 Qianqian Fang - 0.9.8-4 +- Move sample codes to devel and remove from the main package + +* Thu May 28 2020 Qianqian Fang - 0.9.8-3 +- Rebuild packages +- Add sample codes directly to the devel package + +* Wed May 27 2020 Qianqian Fang - 0.9.8-2 +- Update spec file to include demos package + +* Mon May 25 2020 Qianqian Fang - 0.9.8-1 +- Update to new release v0.9.8 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Oct 14 2019 Qianqian Fang - 0.9.2-1 - Initial package