- updated to 2.0.0 (note: new soname)

diff --git a/Pression.spec b/Pression.spec
index 2e445329d1b97e3bec99071085aeb3207cda646e..370b2a35a879d64eac6c15a1fe910f45cb3db8ad 100644 (file)
--- a/Pression.spec
+++ b/Pression.spec
@@ -1,21 +1,29 @@
 #
 # Conditional build:
-%bcond_without apidocs         # do not build and package API docs
+%bcond_without apidocs # API documentation
 
 Summary:       C++ library for compression and CPU-GPU data transfer plugins
+Summary(pl.UTF-8):     Biblioteka C++ do wtyczek kompresji i przesyłu danych CPU-GPU
 Name:          Pression
-Version:       1.2.0
+Version:       2.0.0
 Release:       1
 License:       LGPL v2.1
 Group:         Libraries
+#Source0Download: https://github.com/Eyescale/Pression/releases
 Source0:       https://github.com/Eyescale/Pression/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 47e048b975efc681f00b62fc63951c07
+# Source0-md5: 7b1546fa85838934a302776e5741b7f4
 Source1:       https://github.com/facebook/zstd/archive/83543a7/zstd-83543a7.tar.gz
 # Source1-md5: 81cd6ac24a536b544e78683a373bfeec
-URL:           http://libcollage.net/
-BuildRequires: Lunchbox-devel >= 1.13.0
+Source2:       https://github.com/google/snappy/archive/32d6d7d/snappy-32d6d7d.tar.gz
+# Source2-md5: e3c76d092a1405db503b92db2d65c81f
+URL:           https://eyescale.github.io/
+BuildRequires: Eyescale-CMake >= 2017.05
+BuildRequires: Lunchbox-devel >= 1.16.0
 BuildRequires: boost-devel >= 1.41.0
 BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++ >= 6:4.2
+BuildRequires: libgomp-devel
+BuildRequires: libstdc++-devel
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -24,11 +32,17 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 C++ library for implementing and loading compression and CPU-GPU data
 transfer plugins.
 
+%description -l pl.UTF-8
+Biblioteka C++ do implementowania i ładowania wtyczek kompresji oraz
+przesyłu danych CPU-GPU.
+
 %package devel
 Summary:       Header files for Pression library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Pression
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      Lunchbox-devel >= 1.16.0
+Requires:      boost-devel >= 1.41.0
 
 %description devel
 Header files for Pression library.
@@ -51,19 +65,20 @@ API documentation for Pression library.
 Dokumentacja API biblioteki Pression.
 
 %prep
-%setup -q -a1
+%setup -q -a1 -a2
 
-%{__mv} zstd-83543a7*/* pression/compressor/zstd/
+%{__mv} zstd-83543a7*/* pression/data/zstd/
+%{__mv} snappy-32d6d7d*/* pression/data/snappy/
 
+rmdir CMake/common
 ln -s %{_datadir}/Eyescale-CMake CMake/common
-%{__rm} .gitexternals
 
 %build
 install -d build
 cd build
 CXXFLAGS="%{rpmcxxflags} -Wno-unused-variable"
-%cmake .. \
-       -DBUILDYARD_DISABLED=ON
+%cmake ..
+
 %{__make}
 
 %if %{with apidocs}
@@ -86,15 +101,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.txt README.md doc/Changelog.md
+%doc ACKNOWLEDGEMENTS.txt LICENSE.txt README.md doc/Changelog.md
 %attr(755,root,root) %{_libdir}/libPression.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libPression.so.2
+%attr(755,root,root) %ghost %{_libdir}/libPression.so.3
+%attr(755,root,root) %{_libdir}/libPressionData.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libPressionData.so.3
+%dir %{_datadir}/Pression
+%{_datadir}/Pression/benchmarks
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libPression.so
+%attr(755,root,root) %{_libdir}/libPressionData.so
 %{_includedir}/pression
-%dir %{_datadir}/Pression
 %{_datadir}/Pression/CMake
 
 %if %{with apidocs}