From 239d15b39e959b9a7c8c3fea408610535057eb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Basto?= Date: Sun, 19 Apr 2015 02:35:00 +0100 Subject: [PATCH] Fixed dependency of libimagequant.so.0 - Minor fix on ln to %{libname}.so --- pngquant-2.4.0_fix-Makefile.patch | 41 ++++++++++++++++++++++++++++--- pngquant.spec | 12 ++++++--- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/pngquant-2.4.0_fix-Makefile.patch b/pngquant-2.4.0_fix-Makefile.patch index a7e4d6a..770cec0 100644 --- a/pngquant-2.4.0_fix-Makefile.patch +++ b/pngquant-2.4.0_fix-Makefile.patch @@ -1,11 +1,44 @@ -diff -urp pngquant-2.4.0.1.orig/Makefile pngquant-2.4.0.1/Makefile +--- 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 02:24:14.987943234 +0100 +@@ -1,14 +1,14 @@ + -include config.mk + + STATICLIB=libimagequant.a +-SHAREDLIB=libimagequant.so.0 ++SHAREDLIB=libimagequant.so ++SOVER=0 + + DLL=libimagequant.dll + DLLIMP=libimagequant_dll.a + DLLDEF=libimagequant_dll.def + + OBJS = pam.o mediancut.o blur.o mempool.o viter.o nearest.o libimagequant.o +-SHAREDOBJS = $(subst .o,.lo,$(OBJS)) + + BUILD_CONFIGURATION="$(CC) $(CFLAGS) $(LDFLAGS)" + +@@ -32,11 +32,9 @@ $(DLL) $(DLLIMP): $(OBJS) + $(STATICLIB): $(OBJS) + $(AR) $(ARFLAGS) $@ $^ + +-$(SHAREDOBJS): +- $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@ +- +-$(SHAREDLIB): $(SHAREDOBJS) +- $(CC) -shared -o $@ $^ $(LDFLAGS) ++$(SHAREDLIB): $(OBJS) ++ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) $(CFLAGS) $(OBJS) -o $(SHAREDLIB).$(SOVER) ++ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB) + + $(OBJS): $(wildcard *.h) config.mk + --- pngquant-2.4.0.1.orig/Makefile 2015-04-11 23:24:38.000000000 +0100 -+++ pngquant-2.4.0.1/Makefile 2015-04-18 23:53:29.737846589 +0100 ++++ pngquant-2.4.0.1/Makefile 2015-04-19 02:19:40.340909213 +0100 @@ -11,6 +11,7 @@ OBJS += $(COCOA_OBJS) endif STATICLIB = lib/libimagequant.a -+SHAREDLIB = lib/libimagequant.so.0 ++SHAREDLIB = lib/libimagequant.so DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT TARNAME = pngquant-$(VERSION) @@ -33,7 +66,7 @@ diff -urp pngquant-2.4.0.1.orig/Makefile pngquant-2.4.0.1/Makefile clean: $(MAKE) -C lib clean - rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE) -+ rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(SHAREDLIB) $(TARFILE) ++ rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(TARFILE) distclean: clean $(MAKE) -C lib distclean diff --git a/pngquant.spec b/pngquant.spec index 2f8dd49..b0aab29 100644 --- a/pngquant.spec +++ b/pngquant.spec @@ -2,7 +2,7 @@ Name: pngquant Version: 2.4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PNG quantization tool for reducing image file size %{?el5:Group: Applications/Multimedia} @@ -87,8 +87,7 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} # install libimagequant install -pm 0755 lib/%{libname}.so.0 \ %{buildroot}%{_libdir} -ln -fs %{_libdir}/%{libname}.so.0 \ - %{buildroot}%{_libdir}/%{libname}.so +ln -fs %{libname}.so.0 %{buildroot}%{_libdir}/%{libname}.so install -pm 0644 lib/*.h \ %{buildroot}%{_includedir}/imagequant @@ -126,6 +125,13 @@ install -Dpm0644 pngquant.1 %{buildroot}/%{_mandir}/man1/pngquant.1 %changelog +* Sun Apr 19 2015 Sérgio Basto - 2.4.0.1-2 +- Fixed dependency of libimagequant.so.0 +- Minor fix on ln to %{libname}.so + +* Sun Apr 19 2015 Sérgio Basto - 2.4.0.1-1 +- Update to 2.4.0 + * Mon Feb 09 2015 Sérgio Basto - 2.3.4-1 - Update to 2.3.4