From 768ade58e4d7554ef0d111310e4bc516c4c4f64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 2 Jul 2015 14:39:32 +0100 Subject: [PATCH] Update to 2.5.0 (#1238501) - Update to pngquant-2.5.0_fix-Makefile.patch . --- pngquant-2.5.0_fix-Makefile.patch | 60 +++++++++++++++++++++++++++++++ pngquant.spec | 10 ++++-- sources | 2 +- 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 pngquant-2.5.0_fix-Makefile.patch diff --git a/pngquant-2.5.0_fix-Makefile.patch b/pngquant-2.5.0_fix-Makefile.patch new file mode 100644 index 0000000..d84679e --- /dev/null +++ b/pngquant-2.5.0_fix-Makefile.patch @@ -0,0 +1,60 @@ +--- pngquant-2.4.0.1.orig/lib/Makefile 2015-04-11 23:24:38.000000000 +0100 ++++ pngquant-2.4.0.1/lib/Makefile 2015-04-19 03:35:15.687199897 +0100 +@@ -1,7 +1,8 @@ + -include config.mk + + STATICLIB=libimagequant.a +-SHAREDLIB=libimagequant.so.0 ++SHAREDLIB=libimagequant.so ++SOVER=0 + + DLL=libimagequant.dll + DLLIMP=libimagequant_dll.a +@@ -36,7 +37,8 @@ $(SHAREDOBJS): + $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@ + + $(SHAREDLIB): $(SHAREDOBJS) +- $(CC) -shared -o $@ $^ $(LDFLAGS) ++ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) -o $(SHAREDLIB).$(SOVER) $^ $(LDFLAGS) ++ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB) + + $(OBJS): $(wildcard *.h) config.mk + +--- ./Makefile.orig 2015-06-28 23:52:06.000000000 +0100 ++++ ./Makefile 2015-07-02 13:59:38.465100226 +0100 +@@ -11,6 +11,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) +@@ -29,12 +30,17 @@ staticlib: + + $(STATICLIB): config.mk staticlib + ++sharedlib: ++ $(MAKE) -C lib shared ++ ++$(SHAREDLIB): config.mk sharedlib ++ + $(OBJS): $(wildcard *.h) config.mk + + 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 $@ + + test: $(BIN) +@@ -60,7 +66,7 @@ uninstall: + + clean: + $(MAKE) -C lib clean +- rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE) ++ rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(SHAREDLIB) $(TARFILE) + + distclean: clean + $(MAKE) -C lib distclean diff --git a/pngquant.spec b/pngquant.spec index 7f35962..4583302 100644 --- a/pngquant.spec +++ b/pngquant.spec @@ -1,8 +1,8 @@ %global libname libimagequant Name: pngquant -Version: 2.4.2 -Release: 3%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: PNG quantization tool for reducing image file size %{?el5:Group: Applications/Multimedia} @@ -11,7 +11,7 @@ License: BSD with advertising URL: http://%{name}.org Source0: https://github.com/pornel/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{name}-2.4.0_fix-Makefile.patch +Patch0: %{name}-2.5.0_fix-Makefile.patch %{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)} @@ -123,6 +123,10 @@ install -Dpm0644 pngquant.1 %{buildroot}/%{_mandir}/man1/pngquant.1 %changelog +* Thu Jul 02 2015 Sérgio Basto - 2.5.0-1 +- Update to 2.5.0 (#1238501) +- Update to pngquant-2.5.0_fix-Makefile.patch . + * Sat Jun 20 2015 Sérgio Basto - 2.4.2-3 - pngquant now requires libimagequant with same version diff --git a/sources b/sources index bdff853..39ca753 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f58cbfb3e70d3b0dfc540f73c16d7c82 pngquant-2.4.2.tar.gz +2e51a2827ef5b291d3c7c69b729c2c6e pngquant-2.5.0.tar.gz