rpms/zbar/devel zbar.spec,1.4,1.5

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/zbar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28298/devel

Modified Files:
	zbar.spec 
Log Message:
* Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.10-2
- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
- Always BR qt4-devel rather than qt-devel, it's provided by qt-devel anyway

NOTE: Your package needs to be rebuilt IF AND ONLY IF it was built against Qt 4.6.0 Beta 1. This was in the buildroot ONLY for dist-f13 after F12 branched. Packages built against Qt 4.5.x or older do NOT need a rebuild for 4.6.x (backwards binary compatibility). I have a list of packages needing a rebuild and am going through it. This package is in my list, so I am rebuilding it.


Index: zbar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zbar/devel/zbar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- zbar.spec	7 Nov 2009 16:06:44 -0000	1.4
+++ zbar.spec	25 Nov 2009 01:28:37 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           zbar
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bar code reader
 
 Group:          User Interface/X Hardware Support
@@ -13,12 +13,7 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, gtk2-devel, pygtk2-devel, ImageMagick-c++-devel, libXv-devel, xmlto
-
-%if 0%{?rhel}
-BuildRequires: qt4-devel
-%else
-BuildRequires: qt-devel
-%endif
+BuildRequires:  qt4-devel
 
 %description
 A layered barcode scanning and decoding library. Supports EAN, UPC, Code 128,
@@ -173,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/zbar/QZBar*.h
 
 %changelog
+* Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.10-2
+- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+- Always BR qt4-devel rather than qt-devel, it's provided by qt-devel anyway
+
 * Mon Nov 02 2009 Bastien Nocera <bnocera at redhat.com> 0.10-1
 - Update to 0.10