Hello community, here is the log from the commit of package libdmtx for openSUSE:Factory checked in at 2019-06-27 15:53:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdmtx (Old) and /work/SRC/openSUSE:Factory/.libdmtx.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdmtx" Thu Jun 27 15:53:31 2019 rev:12 rq:711043 version:0.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/libdmtx/libdmtx.changes 2015-12-13 09:37:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdmtx.new.4615/libdmtx.changes 2019-06-27 15:53:32.667951806 +0200 @@ -1,0 +2,15 @@ +Thu Jun 20 07:33:02 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 0.7.5 + * Add support for GS-1 encoding via the FCN1 character + * Fix dmtxDecodeMatrixRegion returning a freed pointer + * makefile: migrating ANSI C -> C99 + * Fixed Data Mosaic encoding bug +- Change the upstream URL. +- Drop patches, now upstream: + * libdmtx-mosaic.patch + * libdmtx-explicit-cast.patch +- Rebase libdmtx-DmtxPropRowPadBytes.patch. +- Update the License tag, only BSD-2-Clause files are used. + +------------------------------------------------------------------- Old: ---- libdmtx-0.7.4.tar.bz2 libdmtx-explicit-cast.patch libdmtx-mosaic.patch New: ---- libdmtx-0.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdmtx.spec ++++++ --- /var/tmp/diff_new_pack.26qlz5/_old 2019-06-27 15:53:33.363952883 +0200 +++ /var/tmp/diff_new_pack.26qlz5/_new 2019-06-27 15:53:33.367952889 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdmtx # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libdmtx -Version: 0.7.4 +Version: 0.7.5 Release: 0 Summary: Software for reading and writing Data Matrix barcodes License: BSD-2-Clause Group: Development/Libraries/C and C++ -Url: http://libdmtx.sourceforge.net/ -Source: http://downloads.sf.net/libdmtx/%{name}-%{version}.tar.bz2 +URL: http://libdmtx.sourceforge.net/ +Source: https://github.com/dmtx/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf Patch0: libdmtx-0.7.4.diff # PATCH-FIX-UPSTREAM libdmtx-DmtxPropRowPadBytes.patch Patch1: libdmtx-DmtxPropRowPadBytes.patch -# PATCH-FIX-UPSTREAM libdmtx-mosaic.patch -Patch2: libdmtx-mosaic.patch -# PATCH-FIX-UPSTREAM libdmtx-explicit-cast.patch -Patch3: libdmtx-explicit-cast.patch BuildRequires: ImageMagick-devel -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig %description libdmtx is open source software for reading and writing Data Matrix barcodes. @@ -43,7 +41,6 @@ %package -n libdmtx0 Summary: Software for reading and writing Data Matrix barcodes -License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries %description -n libdmtx0 @@ -53,7 +50,6 @@ %package devel Summary: Software for reading and writing Data Matrix barcodes -License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: libdmtx0 = %{version} @@ -63,33 +59,28 @@ its capabilities without extra restrictions or overhead. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 +./autogen.sh %build %configure --disable-static make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n libdmtx0 -p /sbin/ldconfig - %postun -n libdmtx0 -p /sbin/ldconfig %files -n libdmtx0 -%defattr(-,root,root,-) -%doc AUTHORS LICENSE ChangeLog KNOWNBUG README +%license LICENSE +%doc AUTHORS ChangeLog KNOWNBUG README %{_mandir}/man?/*dmtx* %{_libdir}/libdmtx.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/dmtx.h %{_libdir}/libdmtx.so %{_libdir}/pkgconfig/libdmtx.pc ++++++ libdmtx-DmtxPropRowPadBytes.patch ++++++ --- /var/tmp/diff_new_pack.26qlz5/_old 2019-06-27 15:53:33.403952945 +0200 +++ /var/tmp/diff_new_pack.26qlz5/_new 2019-06-27 15:53:33.403952945 +0200 @@ -1,7 +1,8 @@ -diff -u libdmtx-0.7.4.orig/dmtxencode.c libdmtx-0.7.4/dmtxencode.c ---- libdmtx-0.7.4.orig/dmtxencode.c 2011-06-02 09:09:36.000000000 +0200 -+++ libdmtx-0.7.4/dmtxencode.c 2014-06-04 08:06:47.306788067 +0200 -@@ -157,7 +157,7 @@ +diff --git a/dmtxencode.c b/dmtxencode.c +index bb810bf..ee0497c 100644 +--- a/dmtxencode.c ++++ b/dmtxencode.c +@@ -167,7 +167,7 @@ extern DmtxPassFail dmtxEncodeDataMatrix(DmtxEncode *enc, int inputSize, unsigned char *inputString) { int sizeIdx; @@ -10,7 +11,7 @@ unsigned char *pxl; DmtxByte outputStorage[4096]; DmtxByteList output = dmtxByteListBuild(outputStorage, sizeof(outputStorage)); -@@ -202,8 +202,12 @@ +@@ -212,8 +212,12 @@ dmtxEncodeDataMatrix(DmtxEncode *enc, int inputSize, unsigned char *inputString) return DmtxFail; assert(bitsPerPixel % 8 == 0); @@ -24,10 +25,11 @@ if(pxl == NULL) { perror("pixel malloc error"); return DmtxFail; -diff -u libdmtx-0.7.4.orig/dmtximage.c libdmtx-0.7.4/dmtximage.c ---- libdmtx-0.7.4.orig/dmtximage.c 2011-06-02 09:09:36.000000000 +0200 -+++ libdmtx-0.7.4/dmtximage.c 2014-06-04 08:04:17.289783266 +0200 -@@ -76,7 +76,7 @@ +diff --git a/dmtximage.c b/dmtximage.c +index bb1b9cf..a944e81 100644 +--- a/dmtximage.c ++++ b/dmtximage.c +@@ -79,7 +79,7 @@ dmtxImageCreate(unsigned char *pxl, int width, int height, int pack) img->bitsPerPixel = GetBitsPerPixel(pack); img->bytesPerPixel = img->bitsPerPixel/8; img->rowPadBytes = 0; @@ -36,7 +38,7 @@ img->imageFlip = DmtxFlipNone; /* Leave channelStart[] and bitsPerChannel[] with zeros from calloc */ -@@ -192,7 +192,10 @@ +@@ -195,7 +195,10 @@ dmtxImageSetProp(DmtxImage *img, int prop, int value) switch(prop) { case DmtxPropRowPadBytes: img->rowPadBytes = value;
