commit dc7f69f08d2be050e88ab9797cfa433a2115c15e
Author: Jakub Bogusz <[email protected]>
Date: Wed Apr 13 22:01:01 2022 +0200
- new URLs, updated to 0.7.6
- removed obsolete imagemagick7 patch
dmtx-utils.spec | 31 +++++++++++++++++++------------
imagemagick7.patch | 48 ------------------------------------------------
2 files changed, 19 insertions(+), 60 deletions(-)
---
diff --git a/dmtx-utils.spec b/dmtx-utils.spec
index 788949f..3d792f2 100644
--- a/dmtx-utils.spec
+++ b/dmtx-utils.spec
@@ -1,34 +1,40 @@
Summary: Utilities for libdmtx
+Summary(pl.UTF-8): Narzędzia do libdmtx
Name: dmtx-utils
-Version: 0.7.4
-Release: 8
+Version: 0.7.6
+Release: 1
License: LGPL v2+
Group: Applications/System
-Source0:
http://downloads.sourceforge.net/libdmtx/%{name}-%{version}.tar.bz2
-# Source0-md5: b132ab9fb1d289869469b8bb4959a08a
+#Source0Download: https://github.com/dmtx/dmtx-utils/tags
+Source0:
https://github.com/dmtx/dmtx-utils/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: c7777dc5db7d7c723e890075a4a5227e
Patch0: ac.patch
-Patch1: imagemagick7.patch
-URL: http://www.libdmtx.org/
-BuildRequires: autoconf
+URL: http://libdmtx.sourceforge.net/
+BuildRequires: ImageMagick-devel >= 1:6.2.4
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: libdmtx-devel
+BuildRequires: libdmtx-devel >= 0.7.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.219
-Obsoletes: libdmtx-utils
+Requires: ImageMagick-libs >= 1:6.2.4
+Requires: libdmtx >= 0.7.0
+Obsoletes: libdmtx-utils < 0.7.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
This package contains utilities that use libdmtx.
+%description -l pl.UTF-8
+Ten pakiet zawiera narzędzia wykorzystujące libdmtx
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
@@ -38,6 +44,7 @@ This package contains utilities that use libdmtx.
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -46,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING.LESSER ChangeLog KNOWNBUG NEWS README README.linux TODO
+%doc AUTHORS ChangeLog KNOWNBUG README README.linux TODO
%attr(755,root,root) %{_bindir}/dmtxquery
%attr(755,root,root) %{_bindir}/dmtxread
%attr(755,root,root) %{_bindir}/dmtxwrite
diff --git a/imagemagick7.patch b/imagemagick7.patch
deleted file mode 100644
index 3cf991c..0000000
--- a/imagemagick7.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur dmtx-utils-0.7.4/configure.ac dmtx-utils-0.7.4-im7/configure.ac
---- dmtx-utils-0.7.4/configure.ac 2016-12-25 17:54:31.633992016 +0100
-+++ dmtx-utils-0.7.4-im7/configure.ac 2016-12-25 17:43:52.006935201 +0100
-@@ -59,7 +59,7 @@
- fi
-
- if test x$dmtxread = xyes -o x$dmtxwrite = xyes; then
-- PKG_CHECK_MODULES(MAGICK, Wand >= 6.2.4, [],
AC_MSG_ERROR([dmtxread/dmtxwrite requires Wand >= 6.2.4]))
-+ PKG_CHECK_MODULES(MAGICK, MagickWand >= 6.2.4, [],
AC_MSG_ERROR([dmtxread/dmtxwrite requires Wand >= 6.2.4]))
- AC_SUBST(MAGICK_CFLAGS)
- AC_SUBST(MAGICK_LIBS)
- fi
-diff -ur dmtx-utils-0.7.4/dmtxread/dmtxread.c
dmtx-utils-0.7.4-im7/dmtxread/dmtxread.c
---- dmtx-utils-0.7.4/dmtxread/dmtxread.c 2011-06-03 07:13:10.000000000
+0200
-+++ dmtx-utils-0.7.4-im7/dmtxread/dmtxread.c 2016-12-25 17:52:06.070673612
+0100
-@@ -114,7 +114,7 @@
- }
-
- /* Copy pixels to known format */
-- success = MagickGetImagePixels(wand, 0, 0, width, height, "RGB",
CharPixel, pxl);
-+ success = MagickImportImagePixels(wand, 0, 0, width, height, "RGB",
CharPixel, pxl);
- if(success == MagickFalse || pxl == NULL) {
- CleanupMagick(&wand, DmtxTrue);
- FatalError(EX_OSERR, "malloc() error");
-diff -ur dmtx-utils-0.7.4/dmtxread/dmtxread.h
dmtx-utils-0.7.4-im7/dmtxread/dmtxread.h
---- dmtx-utils-0.7.4/dmtxread/dmtxread.h 2011-06-03 07:13:10.000000000
+0200
-+++ dmtx-utils-0.7.4-im7/dmtxread/dmtxread.h 2016-12-25 17:53:16.762275566
+0100
-@@ -33,7 +33,7 @@
- #include <math.h>
- #include <stdarg.h>
- #include <assert.h>
--#include <wand/magick-wand.h>
-+#include <MagickWand/MagickWand.h>
- #include <dmtx.h>
- #include "../common/dmtxutil.h"
-
-diff -ur dmtx-utils-0.7.4/dmtxwrite/dmtxwrite.h
dmtx-utils-0.7.4-im7/dmtxwrite/dmtxwrite.h
---- dmtx-utils-0.7.4/dmtxwrite/dmtxwrite.h 2011-06-03 07:13:10.000000000
+0200
-+++ dmtx-utils-0.7.4-im7/dmtxwrite/dmtxwrite.h 2016-12-25 17:53:07.285393032
+0100
-@@ -34,7 +34,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <assert.h>
--#include <wand/magick-wand.h>
-+#include <MagickWand/MagickWand.h>
- #include <dmtx.h>
- #include "../common/dmtxutil.h"
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dmtx-utils.git/commitdiff/dc7f69f08d2be050e88ab9797cfa433a2115c15e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
