.gitignore

@@ -1 +1 @@
-SOURCES/snappy-1.1.8.tar.gz
+SOURCES/1.1.8.tar.gz

.snappy.metadata

@@ -1 +1 @@
-1eeb144e7b564dd726136c97f869b453d2fb7924 SOURCES/snappy-1.1.8.tar.gz
+1eeb144e7b564dd726136c97f869b453d2fb7924 SOURCES/1.1.8.tar.gz

SOURCES/snappy-gtest.patch

@@ -1,7 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ if(SNAPPY_BUILD_TESTS)
        "snappy-test.cc"
    )
    target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)

SPECS/snappy.spec

@@ -1,19 +1,19 @@
-%global __cmake_in_source_build 1
 Name:           snappy
 Version:        1.1.8
-Release:        8%{?dist}
+Release:        3%{?dist}
 Summary:        Fast compression and decompression library
 
+Group:          System Environment/Libraries
 License:        BSD
 URL:            https://github.com/google/snappy
-Source0:        https://github.com/google/snappy/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/google/snappy/archive/%{version}.tar.gz
 
 # add missing dependency on gtest to snappy_unittest
 Patch0:         %{name}-gtest.patch
 
-BuildRequires:  make
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
+BuildRequires:  gtest-devel
 
 %description
 Snappy is a compression/decompression library. It does not aim for maximum 
@@ -26,9 +26,11 @@ bigger.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       cmake-filesystem
 Requires:       pkgconfig
+Obsoletes:      %{name}-devel < %{version}-2
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -63,6 +65,15 @@ rm -rf %{buildroot}
 chmod 644 *.txt AUTHORS COPYING NEWS README.md
 %make_install
 install -m644 -D snappy.pc %{buildroot}%{_libdir}/pkgconfig/snappy.pc
+# Address multilib failures while moving files from _libdir to
+# _datadir
+%ifarch x86_64 s390x ppc64 ppc64le aarch64
+mkdir -p %{buildroot}%{_datadir}/cmake/Modules/lib64/
+mv %{buildroot}%{_libdir}/cmake/Snappy/*cmake %{buildroot}%{_datadir}/cmake/Modules/lib64/
+%else
+mkdir -p %{buildroot}%{_datadir}/cmake/Modules/lib/
+mv %{buildroot}%{_libdir}/cmake/Snappy/*cmake %{buildroot}%{_datadir}/cmake/Modules/lib/
+%endif
 rm -rf %{buildroot}%{_datadir}/doc/snappy/
 rm -rf %{buildroot}%{_datadir}/doc/snappy-devel/
 
@@ -74,55 +85,36 @@ ctest -V %{?_smp_mflags}
 
 
 %files
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README.md
 %{_libdir}/libsnappy.so.*
 
 %files devel
+%defattr(-,root,root,-)
 %doc format_description.txt framing_format.txt
 %{_includedir}/snappy*.h
 %{_libdir}/libsnappy.so
 %{_libdir}/pkgconfig/snappy.pc
-%{_libdir}/cmake/Snappy/
+%ifarch x86_64 s390x ppc64 ppc64le aarch64
+%{_datadir}/cmake/Modules/lib64/*.cmake
+%else
+%{_datadir}/cmake/Modules/lib/*.cmake
+%endif
 
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.8-8
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.1.8-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 8.8
-  Related: rhbz#1991688
 
-* Wed Jun 30 2021 Lianbo Jiang <lijiang@redhat.com> - 1.1.8-7
+* Fri Aug 21 2020 Bhupesh Sharma <bhsharma@redhat.com> - 1.1.8-3
-- Drop BuildRequires dependency on gtest
+- Obsolete snappy-devel versions lower than 1.1.8-2 as lower versions have multilib issues.
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.8-6
+* Fri Jul 24 2020 Bhupesh Sharma <bhsharma@redhat.com> - 1.1.8-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Fix multilib (i686 and x86) issues with snappy-devel package
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-5
+* Wed Jul 22 2020 Bhupesh Sharma <bhsharma@redhat.com> - 1.1.8-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Rebase to latest github version Snappy-1.1.8
-
+- Also change the URL to reflect to the updated github location.
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 24 2020 Jeff Law <law@redhat.com> - 1.1.8-3
-- Use __cmake_in_source_build
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 15 2020 Martin Gieseking <martin.gieseking@uos.de> - 1.1.8-1
-- Updated to new release.
-- Dropped version-related patch which has been applied upstream (BZ #1527850).
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 25 2019 Martin Gieseking <martin.gieseking@uos.de> - 1.1.7-8
-- Moved cmake files to proper directory (BZ #1679727).
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Mon Feb 19 2018 Martin Gieseking <martin.gieseking@uos.de> - 1.1.7-5
 - Added BR: gcc-c++ according to new packaging guidelines.