sergiomb pushed to pngquant (el6). "New bug fix release."
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 15:36:24 UTC 2015
>From 1525f2fc129b5c8136a22fa2faa0d3fbdff88046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
Date: Wed, 7 Jan 2015 02:24:19 +0000
Subject: New bug fix release.
diff --git a/pngquant-2.3.0_fix-Makefile.patch b/pngquant-2.3.0_fix-Makefile.patch
deleted file mode 100644
index 5b34d85..0000000
--- a/pngquant-2.3.0_fix-Makefile.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- ./lib/Makefile.orig 2014-07-11 23:06:08.000000000 +0100
-+++ ./lib/Makefile 2014-09-27 04:27:47.371160997 +0100
-@@ -1,6 +1,8 @@
- -include config.mk
-
- STATICLIB=libimagequant.a
-+SHAREDLIB=libimagequant.so
-+SOVER=0
-
- DLL=libimagequant.dll
- DLLIMP=libimagequant_dll.a
-@@ -14,10 +16,12 @@ DISTFILES = $(OBJS:.o=.c) *.h MANUAL.md
- TARNAME = libimagequant-$(VERSION)
- TARFILE = $(TARNAME)-src.tar.bz2
-
--all: static
-+all: shared
-
- static: $(STATICLIB)
-
-+shared: $(SHAREDLIB)
-+
- dll:
- $(MAKE) CFLAGSADD="-DLIQ_EXPORT='__declspec(dllexport)'" $(DLL)
-
-@@ -28,6 +32,10 @@ $(DLL) $(DLLIMP): $(OBJS)
- $(STATICLIB): $(OBJS)
- $(AR) $(ARFLAGS) $@ $^
-
-+$(SHAREDLIB): $(OBJS)
-+ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) $(LDFLAGS) $(OBJS) -o $(SHAREDLIB).$(SOVER)
-+ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB)
-+
- $(OBJS): $(wildcard *.h) config.mk
-
- dist: $(TARFILE)
---- ./configure.orig 2014-09-27 05:12:31.526575414 +0100
-+++ ./configure 2014-09-27 06:01:41.336738912 +0100
-@@ -230,7 +230,6 @@ status "Compiler" "$CC"
- # init flags
- CFLAGS=${CFLAGS:--O3 -fno-math-errno -funroll-loops -fomit-frame-pointer -Wall}
- cflags "-std=c99 -I."
--lflags "-lm lib/libimagequant.a"
-
- # DEBUG
- if [ -z "$DEBUG" ]; then
---- ./Makefile.orig 2014-10-14 02:15:03.000000000 +0100
-+++ ./Makefile 2014-10-17 21:50:58.450930108 +0100
-@@ -1,7 +1,7 @@
- -include config.mk
-
- BIN ?= pngquant
--BINPREFIX = $(PREFIX)/bin
-+BINPREFIX = $(DESTDIR)/$(PREFIX)/bin
-
- OBJS = pngquant.o rwpng.o
- COCOA_OBJS = rwpng_cocoa.o
-@@ -11,6 +11,8 @@ OBJS += $(COCOA_OBJS)
- endif
-
- STATICLIB = lib/libimagequant.a
-+SHAREDLIB = lib/libimagequant.so
-+SOVER = 0
-
- DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT
- TARNAME = pngquant-$(VERSION)
-@@ -27,13 +29,16 @@ all: $(BIN)
- $(STATICLIB):: config.mk
- $(MAKE) -C lib static
-
-+$(SHAREDLIB):: config.mk
-+ $(MAKE) -C lib shared
-+
- $(OBJS): $(wildcard *.h) config.mk
-
- rwpng_cocoa.o: rwpng_cocoa.m
- $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< || clang -Wno-enum-conversion -c -O3 -o $@ $<
-
--$(BIN): $(STATICLIB) $(OBJS)
-- $(CC) $(OBJS) $(LDFLAGS) -o $@
-+$(BIN): $(SHAREDLIB) $(OBJS)
-+ $(CC) $(OBJS) $(LDFLAGS) $(SHAREDLIB) -o $@
-
- dist: $(TARFILE)
-
-@@ -54,7 +59,7 @@ uninstall:
-
- clean:
- $(MAKE) -C lib clean
-- rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE)
-+ rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(SHAREDLIB) $(TARFILE)
-
- distclean: clean
- $(MAKE) -C lib distclean
diff --git a/pngquant-2.3.2_fix-Makefile.patch b/pngquant-2.3.2_fix-Makefile.patch
new file mode 100644
index 0000000..5bcfa2e
--- /dev/null
+++ b/pngquant-2.3.2_fix-Makefile.patch
@@ -0,0 +1,85 @@
+--- ./lib/Makefile.orig 2014-07-11 23:06:08.000000000 +0100
++++ ./lib/Makefile 2014-09-27 04:27:47.371160997 +0100
+@@ -1,6 +1,8 @@
+ -include config.mk
+
+ STATICLIB=libimagequant.a
++SHAREDLIB=libimagequant.so
++SOVER=0
+
+ DLL=libimagequant.dll
+ DLLIMP=libimagequant_dll.a
+@@ -14,10 +16,12 @@ DISTFILES = $(OBJS:.o=.c) *.h MANUAL.md
+ TARNAME = libimagequant-$(VERSION)
+ TARFILE = $(TARNAME)-src.tar.bz2
+
+-all: static
++all: shared
+
+ static: $(STATICLIB)
+
++shared: $(SHAREDLIB)
++
+ dll:
+ $(MAKE) CFLAGSADD="-DLIQ_EXPORT='__declspec(dllexport)'" $(DLL)
+
+@@ -28,6 +32,10 @@ $(DLL) $(DLLIMP): $(OBJS)
+ $(STATICLIB): $(OBJS)
+ $(AR) $(ARFLAGS) $@ $^
+
++$(SHAREDLIB): $(OBJS)
++ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) $(LDFLAGS) $(OBJS) -o $(SHAREDLIB).$(SOVER)
++ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB)
++
+ $(OBJS): $(wildcard *.h) config.mk
+
+ dist: $(TARFILE)
+--- ./configure.orig 2014-09-27 05:12:31.526575414 +0100
++++ ./configure 2014-09-27 06:01:41.336738912 +0100
+@@ -230,7 +230,6 @@ status "Compiler" "$CC"
+ # init flags
+ CFLAGS=${CFLAGS:--O3 -fno-math-errno -funroll-loops -fomit-frame-pointer -Wall}
+ cflags "-std=c99 -I."
+-lflags "-lm lib/libimagequant.a"
+
+ # DEBUG
+ if [ -z "$DEBUG" ]; then
+--- ./Makefile.orig 2015-01-06 16:13:51.000000000 +0000
++++ ./Makefile 2015-01-06 23:10:30.660389846 +0000
+@@ -11,6 +11,8 @@ OBJS += $(COCOA_OBJS)
+ endif
+
+ STATICLIB = lib/libimagequant.a
++SHAREDLIB = lib/libimagequant.so
++SOVER = 0
+
+ DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT
+ TARNAME = pngquant-$(VERSION)
+@@ -27,13 +29,16 @@ all: $(BIN)
+ $(STATICLIB):: config.mk
+ $(MAKE) -C lib static
+
++$(SHAREDLIB):: config.mk
++ $(MAKE) -C lib shared
++
+ $(OBJS): $(wildcard *.h) config.mk
+
+ rwpng_cocoa.o: rwpng_cocoa.m
+ $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< || clang -Wno-enum-conversion -c -O3 $(CFLAGS) -o $@ $<
+
+-$(BIN): $(STATICLIB) $(OBJS)
+- $(CC) $(OBJS) $(LDFLAGS) -o $@
++$(BIN): $(SHAREDLIB) $(OBJS)
++ $(CC) $(OBJS) $(LDFLAGS) $(SHAREDLIB) -o $@
+
+ dist: $(TARFILE)
+
+@@ -54,7 +59,7 @@ uninstall:
+
+ clean:
+ $(MAKE) -C lib clean
+- rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE)
++ rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(SHAREDLIB) $(TARFILE)
+
+ distclean: clean
+ $(MAKE) -C lib distclean
diff --git a/pngquant.spec b/pngquant.spec
index 75bb675..b5fc98b 100644
--- a/pngquant.spec
+++ b/pngquant.spec
@@ -1,7 +1,7 @@
%global libname libimagequant
Name: pngquant
-Version: 2.3.1
+Version: 2.3.2
Release: 1%{?dist}
Summary: PNG quantization tool for reducing image file size
%{?el5:Group: Applications/Multimedia}
@@ -9,9 +9,9 @@ Summary: PNG quantization tool for reducing image file size
License: BSD with advertising
URL: http://%{name}.org
-Source0: http://github.srcurl.net/pornel/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0: https://github.com/pornel/pngquant/archive/%{name}-%{version}.tar.gz
-Patch0: %{name}-2.3.0_fix-Makefile.patch
+Patch0: %{name}-2.3.2_fix-Makefile.patch
%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
@@ -62,11 +62,12 @@ rm lib/configure
%build
+# this configure export compiler-flags properly
%configure || :
-# export compiler-flags properly
-./configure --prefix=/usr \
+
+./configure --prefix=%{_prefix} --enable-debug \
%ifarch %{ix86}
- --disable-sse \
+ --disable-sse
%endif
make %{?_smp_mflags} PREFIX=%{_prefix}
@@ -94,6 +95,10 @@ install -pm 0644 lib/*.h \
install -pm 0644 %{name}.1 \
%{buildroot}/%{_mandir}/man1/%{name}.1
+mkdir -p %{buildroot}/%{_bindir}
+make install PREFIX=%{_prefix} DESTDIR=%{buildroot}
+install -Dpm0755 pngquant %{buildroot}/%{_bindir}/pngquant
+install -Dpm0644 pngquant.1 %{buildroot}/%{_mandir}/man1/pngquant.1
%clean
%{?el5:rm -rf %{buildroot}}
@@ -120,6 +125,9 @@ install -pm 0644 %{name}.1 \
%changelog
+* Wed Jan 07 2015 Sérgio Basto <sergio at serjux.com> - 2.3.2-1
+- New bug fix release.
+
* Fri Oct 17 2014 Sérgio Basto <sergio at serjux.com> - 2.3.1-1
- New bug fixing release
diff --git a/sources b/sources
index dcde1b8..3fbfc41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2c2fb8a304006ab3d2abbc36cec8fc0 pngquant-2.3.1.tar.gz
+89d45e7a736320e54dca4cc7b2b093e8 pngquant-2.3.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/pngquant.git/commit/?h=el6&id=1525f2fc129b5c8136a22fa2faa0d3fbdff88046
More information about the scm-commits
mailing list