diff --git a/import.log b/import.log index d61b788..a789b48 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ zbar-0_8-5_fc10:HEAD:zbar-0.8-5.fc10.src.rpm:1248899866 +zbar-0_8-6_fc10:HEAD:zbar-0.8-6.fc10.src.rpm:1248913251 diff --git a/zbar.spec b/zbar.spec index 0a12c77..45eda1e 100644 --- a/zbar.spec +++ b/zbar.spec @@ -3,7 +3,7 @@ Name: zbar Version: 0.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bar code reader Group: User Interface/X Hardware Support @@ -12,7 +12,13 @@ URL: http://sourceforge.net/projects/%{name} Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, gtk2-devel, pygtk2-devel, qt-devel >= 4, ImageMagick-c++-devel, libXv-devel, xmlto +BuildRequires: python-devel, gtk2-devel, pygtk2-devel, ImageMagick-c++-devel, libXv-devel, xmlto + +%if 0%{?rhel} +BuildRequires: qt4-devel +%else +BuildRequires: qt-devel +%endif %description A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128, @@ -167,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/zbar/QZBar*.h %changelog +* Wed Jul 29 2009 Itamar Reis Peixoto - 0.8-6 +- fix epel build + * Thu Jul 28 2009 Douglas Schilling Landgraf - 0.8-5 - Now fixed Source0 url - Removed ldconfig calls to devel subpackages