Hello community,
here is the log from the commit of package zopfli for openSUSE:Factory checked
in at 2016-05-19 12:14:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zopfli (Old)
and /work/SRC/openSUSE:Factory/.zopfli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zopfli"
Changes:
--------
--- /work/SRC/openSUSE:Factory/zopfli/zopfli.changes 2016-01-04
09:22:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.zopfli.new/zopfli.changes 2016-05-19
12:14:50.000000000 +0200
@@ -1,0 +2,24 @@
+Mon May 16 19:19:26 UTC 2016 - jeng...@inai.de
+
+- Update summary and compact filelists. Retain timestamps where
+ possible.
+
+-------------------------------------------------------------------
+Mon May 16 18:49:08 UTC 2016 - mplus...@suse.com
+
+- Update to version 1.0.1+git.20160511:
+ * Fix excessive usage of malloc/free
+ * Update squeeze.c
+ * make the sort stable, and move some function definitions to header for
speedup
+ * Update README.zopflipng
+ * Update README
+ * Update README.zopflipng
+ * Update katajainen.c
+ * standardize code style
+ * try both with and without OptimizeHuffmanForRle, for better compression on
small files
+- Add _service and Makefile
+ * merged from package in home:StefanBruens:branches:Archiving
+- Provide zopflipng (boo#980155)
+- Corect generation of manpages (boo#980149)
+
+-------------------------------------------------------------------
Old:
----
zopfli-1.0.1.tar.gz
New:
----
Makefile
_service
zopfli-1.0.1+git.20160511.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zopfli.spec ++++++
--- /var/tmp/diff_new_pack.KEyov4/_old 2016-05-19 12:14:51.000000000 +0200
+++ /var/tmp/diff_new_pack.KEyov4/_new 2016-05-19 12:14:51.000000000 +0200
@@ -16,42 +16,111 @@
#
+%define pngname zopflipng
+%define libversion 1.0.1
+%define pnglibversion 1.0.0
+%define libname lib%{name}1
+%define libpngname lib%{name}png1
+
Name: zopfli
-Version: 1.0.1
+Version: 1.0.1+git.20160511
Release: 0
-Summary: Zlib compression library
+Summary: GZip compatible compression utlity
License: Apache-2.0
Group: Productivity/Archiving/Compression
Url: https://github.com/google/zopfli
-Source:
https://github.com/google/zopfli/archive/zopfli-%{version}.tar.gz
+Source: %{name}-%{version}.tar.xz
+Source1: Makefile
+BuildRequires: gcc-c++
BuildRequires: help2man
+BuildRequires: make
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-Zopfli Compression Algorithm is a compression library programmed in C to
perform
-very good, but slow, deflate or zlib compression.
+Example program for libzopfli to create gzip compatible files. Files can be
+decompressed with e.g. gzip.
+
+%package -n %{libname}
+Summary: Deflate/zlib compatible compression library
+Group: System/Libraries
+
+%description -n %{libname}
+Zopfli Compression Algorithm is a compression library programmed in C to
+perform very good, but slow, deflate or zlib compression.
+
+%package -n %{libpngname}
+Summary: Deflate/zlib compatible compression library
+Group: System/Libraries
+
+%description -n %{libpngname}
+This package contain the libzopflipng PNG optimizer library.
+
+%package -n libzopfli-devel
+Summary: Header files for libzopfli, a gzip-compatible compressor
+Group: Development/Libraries/C and C++
+Requires: %{libname} = %{version}
+Requires: %{libpngname} = %{version}
+%description -n libzopfli-devel
The basic function to compress data is ZopfliCompress in zopfli.h. Use the
ZopfliOptions object to set parameters that affect the speed and compression.
Use the ZopfliInitOptions function to place the default values in the
ZopfliOptions first.
%prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q
+cp %{SOURCE1} Makefile
%build
-# do not use provided makefile as it hardcodes CFLAGS
-cc src/zopfli/*.c %{optflags} -O2 -W -Wall -Wextra -ansi -pedantic -lm -o
%{name}
-help2man -h "h" -v "" -no-info --no-discard-stderr ./%{name} > %{name}.1
+make CFLAGS="%{optflags}" %{?_smp_mflags} libzopfli libzopflipng zopfli
zopflipng
+# help2man since 1.47.1 respects SOURCE_DATE_EPOCH
+export SOURCE_DATE_EPOCH=`echo %{version} | sed -e 's/.*git\.//' | date
-f/dev/stdin +%s`
+help2man --help-option="-h" --version-string=%{version} --no-info
--no-discard-stderr ./%{name} > %{name}.1
+help2man --help-option="-h" --version-string=%{version} --no-info
--no-discard-stderr ./%{pngname} > %{pngname}.1
%install
-install -D -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
-install -D -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
+install -D -pm 0755 %{name} %{buildroot}%{_bindir}/%{name}
+install -D -pm 0755 %{pngname} %{buildroot}%{_bindir}/%{pngname}
+install -D -pm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
+install -D -pm 0644 %{pngname}.1 %{buildroot}%{_mandir}/man1/%{pngname}.1
+install -d -pm 0755 %{buildroot}%{_libdir}
+install -pm 0755 libzopfli.so.%{libversion} %{buildroot}%{_libdir}/
+install -pm 0755 libzopflipng.so.%{pnglibversion} %{buildroot}%{_libdir}/
+install -d -pm 0755 %{buildroot}%{_includedir}/zopfli/
+install -pm 0644 src/zopfli/zopfli.h %{buildroot}%{_includedir}/zopfli/
+install -pm 0644 src/zopfli/deflate.h %{buildroot}%{_includedir}/zopfli/
+install -pm 0644 src/zopfli/zlib_container.h %{buildroot}%{_includedir}/zopfli/
+install -pm 0644 src/zopfli/gzip_container.h %{buildroot}%{_includedir}/zopfli/
+install -pm 0644 src/zopflipng/zopflipng_lib.h
%{buildroot}%{_includedir}/zopfli/
+ln -s libzopfli.so.%{libversion} %{buildroot}%{_libdir}/libzopfli.so
+ln -s libzopfli.so.%{libversion} %{buildroot}%{_libdir}/libzopfli.so.1
+ln -s libzopflipng.so.%{pnglibversion} %{buildroot}%{_libdir}/libzopflipng.so
+ln -s libzopflipng.so.%{pnglibversion} %{buildroot}%{_libdir}/libzopflipng.so.1
+
+%post -n %{libname} -p /sbin/ldconfig
+%post -n %{libpngname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
+%postun -n %{libpngname} -p /sbin/ldconfig
%files
%defattr(-,root,root)
-%doc README COPYING
+%doc README COPYING README.zopflipng
%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_bindir}/zopflipng
+%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/zopflipng.1%{ext_man}
+
+%files -n %{libname}
+%defattr(-,root,root)
+%{_libdir}/libzopfli.so.*
+
+%files -n %{libpngname}
+%defattr(-,root,root)
+%{_libdir}/libzopflipng.so.*
+
+%files -n libzopfli-devel
+%defattr(-,root,root)
+%{_libdir}/libzopfli*.so
+%{_includedir}/zopfli/
%changelog
++++++ Makefile ++++++
CC ?= gcc
CXX ?= g++
CFLAGS += -W -Wall -Wextra -ansi -pedantic -O2
CXXFLAGS += -W -Wall -Wextra -ansi -pedantic -O2
LDFLAGS += -fPIC
LIBS += -lm
ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
src/zopfli/deflate.c src/zopfli/gzip_container.c\
src/zopfli/hash.c src/zopfli/katajainen.c\
src/zopfli/lz77.c src/zopfli/squeeze.c\
src/zopfli/tree.c src/zopfli/util.c\
src/zopfli/zlib_container.c src/zopfli/zopfli_lib.c
ZOPFLILIB_OBJ := $(patsubst %.c,%.o,$(ZOPFLILIB_SRC))
ZOPFLIBIN_SRC := src/zopfli/zopfli_bin.c
LODEPNG_SRC := src/zopflipng/lodepng/lodepng.cpp
src/zopflipng/lodepng/lodepng_util.cpp
ZOPFLIPNGLIB_SRC := src/zopflipng/zopflipng_lib.cc
ZOPFLIPNGBIN_SRC := src/zopflipng/zopflipng_bin.cc
.PHONY: zopfli zopflipng
# Zopfli binary
zopfli:
$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) -o zopfli
$(LIBS)
# Zopfli shared library
libzopfli: $(ZOPFLILIB_OBJ)
$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) -shared
-Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1 $(LIBS)
# ZopfliPNG binary
zopflipng: $(ZOPFLILIB_OBJ)
$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC)
$(ZOPFLIPNGBIN_SRC) $(CFLAGS) $(LDFLAGS) -o zopflipng $(LIBS)
# ZopfliPNG shared library
libzopflipng: $(ZOPFLILIB_OBJ)
$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS)
$(LDFLAGS) --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
$(LIBS)
%.o : %.c
$(CC) $(CFLAGS) $(LDFLAGS) -c $< -o $@ $(LIBS)
# Remove all libraries and binaries
clean:
rm -f zopflipng zopfli $(ZOPFLILIB_OBJ) libzopfli*
++++++ _service ++++++
<services>
<service mode="localonly" name="tar_scm">
<param name="url">git://github.com/google/zopfli</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">zopfli</param>
<param name="versionformat">1.0.1+git.%cd</param>
</service>
<service mode="localonly" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service mode="localonly" name="set_version"/>
</services>
