rpms/zbar/EL-5 import.log,1.1,1.2 zbar.spec,1.1,1.2

[Douglas Schilling Landgraf]

Author: dougsland

Update of /cvs/pkgs/rpms/zbar/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22619/EL-5

Modified Files:
	import.log zbar.spec 
Log Message:
* Wed Jul 29 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.8-6
- fix epel build




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/zbar/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 21:17:26 -0000	1.1
+++ import.log	29 Jul 2009 22:24:41 -0000	1.2
@@ -1 +1,2 @@
 zbar-0_8-5_fc10:EL-5:zbar-0.8-5.fc10.src.rpm:1248902235
+zbar-0_8-6_fc10:EL-5:zbar-0.8-6.fc10.src.rpm:1248906264


Index: zbar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zbar/EL-5/zbar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zbar.spec	29 Jul 2009 21:17:26 -0000	1.1
+++ zbar.spec	29 Jul 2009 22:24:41 -0000	1.2
@@ -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/p
 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 <itamar at ispbrasil.com.br> - 0.8-6
+- fix epel build
+
 * Thu Jul 28 2009 Douglas Schilling Landgraf <dougsland at redhat.com> - 0.8-5
 - Now fixed Source0 url
 - Removed ldconfig calls to devel subpackages