- updated to 2.6.0

- updated shared patch
- removed obsolete soname patch

diff --git a/pngquant-shared.patch b/pngquant-shared.patch
index 9566b7fa5eb97239543b410f1b333457f7108e1b..5f1d82bb85d3eea159f7b842431471d8939adb3e 100644 (file)
--- a/pngquant-shared.patch
+++ b/pngquant-shared.patch
@@ -1,33 +1,11 @@
---- pngquant-2.4.1/Makefile.orig       2015-06-21 15:34:33.361895698 +0200
-+++ pngquant-2.4.1/Makefile    2015-06-21 15:34:40.398562068 +0200
-@@ -10,7 +10,7 @@
- OBJS += $(COCOA_OBJS)
- endif
- 
--STATICLIB = lib/libimagequant.a
-+SHAREDLIB = lib/libimagequant.so
- 
- DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT
- TARNAME = pngquant-$(VERSION)
-@@ -24,17 +24,17 @@
- 
- all: $(BIN)
- 
--staticlib:
--      $(MAKE) -C lib static
-+sharedlib:
-+      $(MAKE) -C lib shared
- 
--$(STATICLIB): config.mk staticlib
-+$(SHAREDLIB): config.mk sharedlib
- 
- $(OBJS): $(wildcard *.h) config.mk
- 
+--- 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 $@ $< || clang -Wno-enum-conversion -c -O3 $(CFLAGS) -o $@ $<
+       $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< &> /dev/null || clang -Wno-enum-conversion -c -O3 $(CFLAGS) -o $@ $<
  
 -$(BIN): $(OBJS) $(STATICLIB)
 +$(BIN): $(OBJS) $(SHAREDLIB)
-       $(CC) $^ $(LDFLAGS) -o $@
+       $(CC) $^ $(CFLAGS) $(LDFLAGS) -o $@
  
- test: $(BIN)
+ $(TESTBIN): test/test.o $(STATICLIB)

diff --git a/pngquant-soname.patch b/pngquant-soname.patch
deleted file mode 100644 (file)
index f67c8ea..0000000
--- a/pngquant-soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pngquant-2.4.1/lib/Makefile.orig   2015-06-12 23:46:49.000000000 +0200
-+++ pngquant-2.4.1/lib/Makefile        2015-06-21 15:21:49.201927767 +0200
-@@ -36,7 +36,8 @@
-       $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@
- 
- $(SHAREDLIB): $(SHAREDOBJS)
--      $(CC) -shared -o $@ $^ $(LDFLAGS)
-+      $(CC) -shared -o $@ $^ $(LDFLAGS) -Wl,-soname,$(SHAREDLIB)
-+      ln -sf $(SHAREDLIB) libimagequant.so
- 
- $(OBJS): $(wildcard *.h) config.mk
- 

diff --git a/pngquant.spec b/pngquant.spec
index 848fa3b58d2e0eec9c2e29846cb4a6bc711484f2..19d9fb2977423df1e488ca94facea60c6441a899 100644 (file)
--- a/pngquant.spec
+++ b/pngquant.spec
@@ -11,15 +11,14 @@
 Summary:       PNG converter and lossy image compressor
 Summary(pl.UTF-8):     Konwerter i stratny kompresor dla plików PNG
 Name:          pngquant
-Version:       2.4.1
+Version:       2.6.0
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://pngquant.org/releases.html
-Source0:       https://pngquant.org/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 2809b10f8d183853c1283cfdfa292ab3
-Patch0:                %{name}-soname.patch
-Patch1:                %{name}-shared.patch
+Source0:       https://pngquant.org/%{name}-%{version}-src.tar.gz
+# Source0-md5: 54df683f87cd5bfc15b3c2764419c957
+Patch0:                %{name}-shared.patch
 URL:           https://pngquant.org/
 %{?with_openmp:BuildRequires:  gcc >= 6:4.2}
 %{?with_openmp:BuildRequires:  libgomp-devel}
@@ -77,7 +76,6 @@ Statyczna biblioteka libimagequant.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # not autoconf configure
@@ -101,6 +99,7 @@ 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}
@@ -117,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %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)