From cd30b57d29f45be8621f0e62452c8fc2cd3c0b50 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak@cgc-instruments.com>
Date: Feb 24 2019 19:44:43 +0000
Subject: Update to 1.0.2 & create zopfli-devel subpackage


---

diff --git a/0001-Honor-user-C-XX-FLAGS.patch b/0001-Honor-user-C-XX-FLAGS.patch
deleted file mode 100644
index dbdf6b2..0000000
--- a/0001-Honor-user-C-XX-FLAGS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fa0a91f17ed7e5cf4c772457fc738ab69b0db9e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Thu, 11 Feb 2016 00:12:10 +0200
-Subject: [PATCH] Honor user C(XX)FLAGS
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 26518ec..36eada9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,8 @@
- CC = gcc
- CXX = g++
- 
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+override CFLAGS := -W -Wall -Wextra -ansi -pedantic -lm -O2 $(CFLAGS)
-+override CXXFLAGS := -W -Wall -Wextra -ansi -pedantic -O2 $(CXXFLAGS)
- 
- ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
-                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
--- 
-2.5.0
-
diff --git a/sources b/sources
index a2a1ae6..17aa3f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc41b0619cf5632460396e0c997352b9  zopfli-1.0.1.tar.gz
+SHA512 (ef109ddf164911cf1e5612e90b4a619839a1e3ca.tar.gz) = 9067d14c3ca7f5f07a0c4913ae1804128cf928770359618eab3c655ccbfa7260a11ec1db871a7e5be7d92098c2dda5a55b948eb779c9c64647bddfd1e9ace1f5
diff --git a/zopfli.spec b/zopfli.spec
index 344d6a5..6b73e7b 100644
--- a/zopfli.spec
+++ b/zopfli.spec
@@ -1,16 +1,19 @@
+%global commit ef109ddf164911cf1e5612e90b4a619839a1e3ca
+%global short_commit ef109dd
+%global so_ver 1.0.2
+
 Name:           zopfli
-Version:        1.0.1
-Release:        8%{?dist}
+Version:        %{so_ver}.%{short_commit}git
+Release:        1%{?dist}
 Summary:        Zlib compatible better compressor
 
 License:        ASL 2.0
-URL:            https://github.com/google/zopfli
-Source0:        https://github.com/google/%{name}/archive/%{name}-%{version}.tar.gz
-# https://github.com/google/zopfli/pull/92
-Patch0:         0001-Honor-user-C-XX-FLAGS.patch
+URL:            https://github.com/google/%{name}
+Source0:        %{URL}/archive/%{commit}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
+BuildRequires:  cmake
 
 %description
 Zopfli is a compression algorithm bit-stream compatible with
@@ -20,26 +23,52 @@ hence best suited for applications where data is compressed once and
 sent over a network many times, for example, static content for the
 web.
 
+%package        devel
+Requires:       %{name} = %{version}-%{release}
+Summary:        Development files for zopfli and zopflipng.
+
+%description    devel
+Devolopment files for zopfli and zopflipng.
+
 %prep
-%autosetup -n %{name}-%{name}-%{version}
+%autosetup -n %{name}-%{commit}
 
 %build
-CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make %{?_smp_mflags} \
-    zopfli zopflipng
+mkdir build && cd build
+%cmake -DZOPFLI_BUILD_SHARED=ON ..
+%make_build
 
 %install
-mkdir -p %{buildroot}%{_bindir}
-install -m 0755 zopfli zopflipng %{buildroot}%{_bindir}/
+cd build
+%make_install
 
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc CONTRIBUTORS README README.zopflipng
-%{_bindir}/zopfli
-%{_bindir}/zopflipng
+%{_bindir}/%{name}
+%{_bindir}/%{name}png
+
+%{_libdir}/lib%{name}.so.1
+%{_libdir}/lib%{name}.so.%{so_ver}
+
+%{_libdir}/lib%{name}png.so.1
+%{_libdir}/lib%{name}png.so.%{so_ver}
+
+%files          devel
+%{_libdir}/lib%{name}.so
+%{_libdir}/lib%{name}png.so
+
+%{_includedir}/%{name}.h
+%{_includedir}/%{name}png_lib.h
+%{_libdir}/cmake/Zopfli/*.cmake
 
 
 %changelog
+* Sun Feb 24 2019 Dan Čermák <dan.cermak@cgc-instruments.com> - 1.0.2.ef109ddgit-1
+- Update to 1.0.2
+- Create devel subpackage
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild