fix build
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/zbar?expand=0&rev=6
This commit is contained in:
parent
c4dc610053
commit
b813ae048a
15
fix_build.patch
Normal file
15
fix_build.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -ur zbar-0.10_2012_08_06/configure.ac zbar-0.10_2012_08_06_fix/configure.ac
|
||||||
|
--- zbar-0.10_2012_08_06/configure.ac 2012-08-06 18:29:28.271138221 +0200
|
||||||
|
+++ zbar-0.10_2012_08_06_fix/configure.ac 2012-08-06 19:12:42.396126332 +0200
|
||||||
|
@@ -3,9 +3,10 @@
|
||||||
|
AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
|
||||||
|
AC_CONFIG_AUX_DIR(config)
|
||||||
|
AC_CONFIG_MACRO_DIR(config)
|
||||||
|
-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
|
||||||
|
+AM_INIT_AUTOMAKE([1.10 -Wall foreign subdir-objects std-options dist-bzip2])
|
||||||
|
AC_CONFIG_HEADERS([include/config.h])
|
||||||
|
AC_CONFIG_SRCDIR(zbar/scanner.c)
|
||||||
|
+AM_PROG_AR
|
||||||
|
LT_PREREQ([2.2])
|
||||||
|
LT_INIT([dlopen win32-dll])
|
||||||
|
LT_LANG([Windows Resource])
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:167ce5f52702dfbfa0b95ee26969ad6107cbec5e5bf33104669c19cde04703ae
|
|
||||||
size 618404
|
|
3
zbar-0.10_2012_08_06.tar.bz2
Normal file
3
zbar-0.10_2012_08_06.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:cbd7cc947f20676bf106b7760f3d246189a0cac66ae68841ae39a375028fb66a
|
||||||
|
size 649958
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Aug 6 17:19:54 UTC 2012 - opensuse@dstoecker.de
|
||||||
|
|
||||||
|
- fix build, update to recent mercurial revision from 2012-08-06
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Nov 19 23:06:38 UTC 2011 - opensuse@dstoecker.de
|
Sat Nov 19 23:06:38 UTC 2011 - opensuse@dstoecker.de
|
||||||
|
|
||||||
|
11
zbar.spec
11
zbar.spec
@ -18,20 +18,22 @@
|
|||||||
%define libname libzbar0
|
%define libname libzbar0
|
||||||
|
|
||||||
Name: zbar
|
Name: zbar
|
||||||
Version: 0.10_2011_11_19
|
Version: 0.10_2012_08_06
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Bar code reader
|
Summary: Bar code reader
|
||||||
Group: Productivity/Other
|
Group: Productivity/Other
|
||||||
License: LGPLv2.1+
|
License: LGPL-2.1+
|
||||||
Url: http://zbar.sourceforge.net
|
Url: http://zbar.sourceforge.net
|
||||||
BuildRequires: ImageMagick-devel libqt4-devel gtk2-devel python-gtk-devel
|
BuildRequires: ImageMagick-devel libqt4-devel gtk2-devel python-gtk-devel
|
||||||
# required by mercurial archive only
|
# required by mercurial archive only
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
|
BuildRequires: libtool
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
Patch1: fix_build.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
ZBar is an open source software suite for reading bar codes from various
|
ZBar is an open source software suite for reading bar codes from various
|
||||||
@ -158,8 +160,9 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1
|
||||||
# for the Mercurial-based archive we need to get proper autoconf files
|
# for the Mercurial-based archive we need to get proper autoconf files
|
||||||
autoreconf -i
|
autoreconf -fi
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Mercurial only? - This should not be required in a final release version!
|
# Mercurial only? - This should not be required in a final release version!
|
||||||
@ -198,6 +201,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir %_includedir/%{name}
|
%dir %_includedir/%{name}
|
||||||
%_includedir/zbar.h
|
%_includedir/zbar.h
|
||||||
%_includedir/%{name}/*.h
|
%_includedir/%{name}/*.h
|
||||||
|
%exclude %_includedir/%{name}/zbargtk.h
|
||||||
|
%exclude %_includedir/%{name}/QZBar*.h
|
||||||
%_libdir/libzbar.so
|
%_libdir/libzbar.so
|
||||||
%_libdir/libzbar.so.0
|
%_libdir/libzbar.so.0
|
||||||
%_libdir/pkgconfig/zbar.pc
|
%_libdir/pkgconfig/zbar.pc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user