diff --git a/update.sh b/update.sh new file mode 100644 index 0000000..3fea4a8 --- /dev/null +++ b/update.sh @@ -0,0 +1,10 @@ +#! /bin/bash + +hg clone http://zbar.hg.sourceforge.net:8000/hgroot/zbar +osc rm zbar-*.tar.bz2 +pushd zbar +ARC=`date +"zbar-0.10_%Y_%m_%d.tar.bz2"` +hg archive "../$ARC" +popd +rm -rfv zbar +osc add $ARC diff --git a/zbar-0.10_2012_08_06.tar.bz2 b/zbar-0.10_2012_08_06.tar.bz2 deleted file mode 100644 index 1316e41..0000000 --- a/zbar-0.10_2012_08_06.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbd7cc947f20676bf106b7760f3d246189a0cac66ae68841ae39a375028fb66a -size 649958 diff --git a/zbar-0.10_2013_02_28.tar.bz2 b/zbar-0.10_2013_02_28.tar.bz2 new file mode 100644 index 0000000..61fb3ad --- /dev/null +++ b/zbar-0.10_2013_02_28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c7ad832c603dcc5531a3816c092dc59f87df3782fe0111bb6becd2f65cbdc6a +size 648280 diff --git a/zbar.changes b/zbar.changes index a924db7..ef872c8 100644 --- a/zbar.changes +++ b/zbar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 28 17:29:29 UTC 2013 - opensuse@dstoecker.de + +- update to current mercurial code + ------------------------------------------------------------------- Mon Aug 6 17:19:54 UTC 2012 - opensuse@dstoecker.de diff --git a/zbar.spec b/zbar.spec index f260886..a7f8955 100644 --- a/zbar.spec +++ b/zbar.spec @@ -1,7 +1,7 @@ # -# spec file for package zbar (Version 0.10) +# spec file for package zbar # -# Copyright 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright 2010 Carlos Goncalves . # # All modifications and additions to the file contributed by third parties @@ -13,26 +13,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# norootforbuild +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + %define libname libzbar0 Name: zbar -Version: 0.10_2012_08_06 -Release: 1 +Version: 0.10_2013_02_28 +Release: 0 Summary: Bar code reader -Group: Productivity/Other License: LGPL-2.1+ +Group: Productivity/Other Url: http://zbar.sourceforge.net -BuildRequires: ImageMagick-devel libqt4-devel gtk2-devel python-gtk-devel +BuildRequires: ImageMagick-devel +BuildRequires: gtk2-devel +BuildRequires: libqt4-devel +BuildRequires: python-gtk-devel # required by mercurial archive only -BuildRequires: xmlto BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: xmlto Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on Patch1: fix_build.patch %description @@ -50,8 +54,8 @@ embedded use. %package -n %{libname} Summary: ZBar library -Provides: lib%{name} Group: Development/Libraries/C and C++ +Provides: lib%{name} %description -n %{libname} This package provides the ZBar library. @@ -60,7 +64,8 @@ This package provides the ZBar library. Summary: Development environment for the ZBar library Group: Development/Libraries/C and C++ Provides: lib%{name}-devel -Requires: %{libname} = %{version}, pkgconfig +Requires: %{libname} = %{version} +Requires: pkgconfig %description -n %{libname}-devel This package contains all necessary include files, libraries, @@ -89,7 +94,8 @@ Summary: Development environment for the ZBar Qt bindings library Group: Development/Libraries/C and C++ Provides: lib%{name}qt-devel Requires: lib%{name}-devel -Requires: libzbarqt0 = %{version}, pkgconfig +Requires: libzbarqt0 = %{version} +Requires: pkgconfig %description -n libzbarqt0-devel This package contains all necessary include files, libraries, @@ -109,7 +115,8 @@ Summary: Development environment for the ZBar Gtk bindings library Group: Development/Libraries/C and C++ Provides: lib%{name}gtk-devel Requires: lib%{name}-devel -Requires: libzbargtk0 = %{version}, pkgconfig +Requires: libzbargtk0 = %{version} +Requires: pkgconfig %description -n libzbargtk0-devel This package contains all necessary include files, libraries, @@ -135,7 +142,7 @@ autoreconf -fi %build # Mercurial only? - This should not be required in a final release version! -export CFLAGS="$RPM_OPT_FLAGS -Wno-error=parentheses" +export CFLAGS="$RPM_OPT_FLAGS -Wno-error=parentheses -Wno-error=deprecated-declarations" %configure --docdir=%{_docdir}/%{name} make %{?jobs:-j%jobs} @@ -207,4 +214,3 @@ rm -rf $RPM_BUILD_ROOT %{py_sitedir}/zbarpygtk.so %changelog -