--- cauldron/harbour/current/SPECS/harbour.spec	2012/09/15 12:26:20	294125
+++ cauldron/harbour/current/SPECS/harbour.spec	2012/09/15 12:29:48	294126
@@ -78,7 +78,7 @@
 %define dev_pgsql      %mklibname %{name}-pgsql -d -s
 %endif
 %if %{_with_qt} == 1
-%define dev_qt         %mklibname %{name}-dev_qt -d -s
+%define dev_qt         %mklibname %{name}-qt -d -s
 %endif
 
 %define hb_etcdir      /etc/%{name}
@@ -113,7 +113,7 @@
 
 Name:		%{name}
 Version:	%{version}
-Release:	%mkrel 5
+Release:	%mkrel 6
 Summary:	Free software Clipper compatible compiler
 License:	GPLv2+
 Group:		Development/Other
@@ -209,7 +209,7 @@
 %package -n %{dev_contrib}
 Summary:        Contrib runtime libaries for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-contrib = 3.0.0-4
 
 %description -n %{dev_contrib}
@@ -225,7 +225,7 @@
 %package -n %{dev_allegro}
 Summary:        Allegro GT for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-allegro = 3.0.0-4
 
 %description -n %{dev_allegro}
@@ -238,7 +238,7 @@
 %package -n %{dev_cairo}
 Summary:        Cairo library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-cairo = 3.0.0-4
 
 %description -n %{dev_cairo}
@@ -251,7 +251,7 @@
 %package -n %{dev_cups}
 Summary:        CUPS library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-cups = 3.0.0-4
 
 %description -n %{dev_cups}
@@ -264,7 +264,7 @@
 %package -n %{dev_curl}
 Summary:        CURL library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-curl = 3.0.0-4
 
 %description -n %{dev_curl}
@@ -277,7 +277,7 @@
 %package -n %{dev_firebird}
 Summary:        FireBird library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-firebird = 3.0.0-4
 
 %description -n %{dev_firebird}
@@ -290,7 +290,7 @@
 %package -n %{dev_freeimage}
 Summary:        FreeImage library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n %{dev_freeimage}
 %{dname} is a Clipper compatible compiler.
@@ -302,7 +302,7 @@
 %package -n %{dev_gd}
 Summary:        GD library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-gd = 3.0.0-4
 
 %description -n %{dev_gd}
@@ -315,7 +315,7 @@
 %package -n %{dev_mysql}
 Summary:        MYSQL library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-mysql = 3.0.0-4
 
 %description -n %{dev_mysql}
@@ -328,7 +328,7 @@
 %package -n %{dev_odbc}
 Summary:        ODBC library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-odbc = 3.0.0-4
 
 %description -n %{dev_odbc}
@@ -341,7 +341,7 @@
 %package -n %{dev_pgsql}
 Summary:        PGSQL library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-pgsql = 3.0.0-4
 
 %description -n %{dev_pgsql}
@@ -354,8 +354,11 @@
 %package -n %{dev_qt}
 Summary:        QT library bindings for %{dname} compiler
 Group:          Development/Other
-Requires:       libqt4-devel %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       qt4-devel 
+Requires:       %{name} = %{version}-%{release}
 Obsoletes:      %{name}-qt = 3.0.0-4
+# Fix typo in earlier packagename
+Obsoletes:	%{name}-dev_qt-static-devel = 3.0.0-5
 
 %description -n %{dev_qt}
 %{dname} is a Clipper compatible compiler.
@@ -365,7 +368,7 @@
 %package hbide
 Summary:     Harbour Integrated Development Environment
 Group:       Development/Other
-Requires:    %{libharbour} = %{version}-%{release}
+Requires:    %{name} = %{version}-%{release}
 
 %description hbide
 HBIDE is an integrated development environment written in %{dname}.
@@ -716,7 +719,6 @@
 
 %files -n %{dev_contrib}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbnf.a
 %{_libdir}/%{name}/libhbblink.a
 %{_libdir}/%{name}/libhbmisc.a
@@ -743,14 +745,12 @@
 %if %{_with_allegro} == 1
 %files -n %{dev_allegro}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libgtalleg.a
 %endif
 
 %if %{_with_cairo} == 1
 %files -n %{dev_cairo}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbcairo.a
 %defattr(644,root,root)
 %{_includedir}/%{name}/hbcairo.ch
@@ -760,7 +760,6 @@
 %if %{_with_cups} == 1
 %files -n %{dev_cups}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbcups.a
 %attr(644,root,root) %{_includedir}/%{name}/hbcups.hbx
 %endif
@@ -768,7 +767,6 @@
 %if %{_with_curl} == 1
 %files -n %{dev_curl}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbcurl.a
 %defattr(644,root,root)
 %{_includedir}/%{name}/hbcurl.ch
@@ -778,7 +776,6 @@
 %if %{_with_firebird} == 1
 %files -n %{dev_firebird}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbfbird.a
 %{_libdir}/%{name}/libsddfb.a
 %attr(644,root,root) %{_includedir}/%{name}/hbfbird.hbx
@@ -787,7 +784,6 @@
 %if %{_with_freeimage} == 1
 %files -n %{dev_freeimage}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbfimage.a
 %defattr(644,root,root)
 %{_includedir}/%{name}/freeimag.ch
@@ -797,7 +793,6 @@
 %if %{_with_gd} == 1
 %files -n %{dev_gd}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbgd.a
 %defattr(644,root,root)
 %{_includedir}/%{name}/gd.ch
@@ -808,7 +803,6 @@
 %if %{_with_mysql} == 1
 %files -n %{dev_mysql}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbmysql.a
 %{_libdir}/%{name}/libsddmy.a
 %defattr(644,root,root)
@@ -819,7 +813,6 @@
 %if %{_with_odbc} == 1
 %files -n %{dev_odbc}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbodbc.a
 %{_libdir}/%{name}/libsddodbc.a
 %defattr(644,root,root)
@@ -830,7 +823,6 @@
 %if %{_with_pgsql} == 1
 %files -n %{dev_pgsql}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbpgsql.a
 %{_libdir}/%{name}/libsddpg.a
 %defattr(644,root,root)
@@ -841,7 +833,6 @@
 %if %{_with_qt} == 1
 %files -n %{dev_qt}
 %defattr(644,root,root,755)
-%dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbqt*.a
 %{_libdir}/%{name}/libhbxbp.a
 %defattr(644,root,root)