- updated to 2.11.7

- removed outdated shared patch
- use system libimagequant

diff --git a/pngquant-shared.patch b/pngquant-shared.patch
deleted file mode 100644 (file)
index 5f1d82b..0000000
--- a/pngquant-shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pngquant-2.6.0/Makefile.orig       2016-02-21 01:19:50.000000000 +0100
-+++ pngquant-2.6.0/Makefile    2016-03-06 13:17:13.470363122 +0100
-@@ -43,7 +43,7 @@
- rwpng_cocoa.o: rwpng_cocoa.m
-       $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< &> /dev/null || clang -Wno-enum-conversion -c -O3 $(CFLAGS) -o $@ $<
- 
--$(BIN): $(OBJS) $(STATICLIB)
-+$(BIN): $(OBJS) $(SHAREDLIB)
-       $(CC) $^ $(CFLAGS) $(LDFLAGS) -o $@
- 
- $(TESTBIN): test/test.o $(STATICLIB)

diff --git a/pngquant.spec b/pngquant.spec
index 34a09f2eea4c029c3f137d694f863b349fa8c0f6..2367e918b8ae8eb4c500c56135d88d795f686b49 100644 (file)
--- a/pngquant.spec
+++ b/pngquant.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build:
-%bcond_without static_libs     # static library
 %bcond_without openmp          # OpenMP support
 %bcond_without lcms            # LCMS support
 %bcond_with    sse             # SSE instructions
@@ -11,22 +10,23 @@
 Summary:       PNG converter and lossy image compressor
 Summary(pl.UTF-8):     Konwerter i stratny kompresor dla plików PNG
 Name:          pngquant
-Version:       2.7.2
-Release:       2
-License:       BSD
+Version:       2.11.7
+Release:       1
+# some original code was on MIT-like license
+License:       GPL v3+ with MIT parts or commercial
 Group:         Libraries
 #Source0Download: https://pngquant.org/releases.html
 Source0:       https://pngquant.org/%{name}-%{version}-src.tar.gz
-# Source0-md5: d0f20b42cfd79a039c6af50aebb851a0
-Patch0:                %{name}-shared.patch
+# Source0-md5: b9f509e46e0dedc541ebb24f7cf4d00e
 URL:           https://pngquant.org/
 %{?with_openmp:BuildRequires:  gcc >= 6:4.2}
 %{?with_openmp:BuildRequires:  libgomp-devel}
 %{?with_lcms:BuildRequires:    lcms2-devel >= 2}
+BuildRequires: libimagequant-devel >= 2.11
 BuildRequires: libpng-devel
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
-Requires:      libimagequant = %{version}-%{release}
+Requires:      libimagequant >= 2.11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,47 +35,8 @@ PNG converter and lossy image compressor.
 %description -l pl.UTF-8
 Konwerter i stratny kompresor dla plików PNG.
 
-%package -n libimagequant
-Summary:       Image Quantization library
-Summary(pl.UTF-8):     Biblioteka do kwantyzacji obrazów
-Group:         Libraries
-URL:           https://pngquant.org/lib/
-
-%description -n libimagequant
-Image Quantization library.
-
-%description -n libimagequant -l pl.UTF-8
-Biblioteka do kwantyzacji obrazów.
-
-%package -n libimagequant-devel
-Summary:       Header files for libimagequant library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libimagequant
-Group:         Development/Libraries
-URL:           https://pngquant.org/lib/
-Requires:      libimagequant = %{version}-%{release}
-
-%description -n libimagequant-devel
-Header files for libimagequant library.
-
-%description -n libimagequant-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki libimagequant.
-
-%package -n libimagequant-static
-Summary:       Static libimagequant library
-Summary(pl.UTF-8):     Statyczna biblioteka libimagequant
-Group:         Development/Libraries
-URL:           https://pngquant.org/lib/
-Requires:      libimagequant-devel = %{version}-%{release}
-
-%description -n libimagequant-static
-Static libimagequant library.
-
-%description -n libimagequant-static -l pl.UTF-8
-Statyczna biblioteka libimagequant.
-
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # not autoconf configure
@@ -86,50 +47,22 @@ Statyczna biblioteka libimagequant.
        --prefix=%{_prefix} \
        %{__enable_disable sse} \
        %{?with_lcms:--with-lcms2} \
+       --with-libimagequant \
        %{?with_openmp:--with-openmp}
 
-%{__make} -C lib %{!?with_static_libs:shared}
-
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# not covered by make install
-cp -a lib/libimagequant.so* $RPM_BUILD_ROOT%{_libdir}
-%if %{with static_libs}
-cp -p lib/libimagequant.a $RPM_BUILD_ROOT%{_libdir}
-%endif
-cp -p lib/libimagequant.h $RPM_BUILD_ROOT%{_includedir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -n libimagequant -p /sbin/ldconfig
-%postun        -n libimagequant -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG COPYRIGHT README.md
 %attr(755,root,root) %{_bindir}/pngquant
 %{_mandir}/man1/pngquant.1*
-
-%files -n libimagequant
-%defattr(644,root,root,755)
-%doc lib/{COPYRIGHT,MANUAL.md}
-%attr(755,root,root) %{_libdir}/libimagequant.so.0
-
-%files -n libimagequant-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libimagequant.so
-%{_includedir}/libimagequant.h
-
-%if %{with static_libs}
-%files -n libimagequant-static
-%defattr(644,root,root,755)
-%{_libdir}/libimagequant.a
-%endif