RPM: more updates for mageia/openmandriva BuildRequires

Signed-off-by: François Andriot <albator78@libertysurf.fr>

redhat/applications/graphics/ksquirrel/ksquirrel.spec

@@ -85,7 +85,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/applications/internet/kbiff/kbiff.spec

@@ -57,7 +57,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	tqt3-compat-headers >= 3.5.0
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 

redhat/applications/multimedia/amarok/amarok.spec

@@ -89,7 +89,7 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # ALSA supportl
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel

redhat/applications/multimedia/k3b/k3b.spec

@@ -78,7 +78,7 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # ALSA supportl
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel

redhat/applications/multimedia/k9copy/k9copy.spec

@@ -94,7 +94,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/applications/office/koffice/koffice.spec

@@ -306,7 +306,7 @@ BuildRequires:	wv2-devel
 %if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}mesagl-devel
 %endif
-%if 0%{?mdkver} >= 24090000
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires:	%{_lib}glu-devel
 %else
 BuildRequires:	%{_lib}mesaglu1-devel

redhat/build/get_rpm_package_name.sh

@@ -115,7 +115,7 @@ if [ -n "${DEVEL}" ]; then
     "polkit-tqt")  PKGDEVEL="${lib}polkit-tqt-devel";;
     "tqca")        PKGDEVEL="${lib}tqca-devel";;
     "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
-    "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
+    "tqt3")        PKGDEVEL="tqt3-dev-tools tqt3-apps-devel ${lib}tqt3-mt-sqlite3";;
     "yaz")         PKGDEVEL="${lib}yaz-devel";;
     # Default case: development package has same name as runtime package, plus '-devel' suffix.
     *)             PKGDEVEL="${PKGRUNTIME}-devel";;

redhat/core/tdeaccessibility/tdeaccessibility.spec

@@ -95,7 +95,7 @@ BuildRequires: trinity-akode-devel
 %endif
 
 # ALSA support
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel

redhat/core/tdeaddons/tdeaddons.spec

@@ -94,7 +94,7 @@ BuildRequires:	SDL-devel
 %endif
 
 # ALSA supportl
-%if 0%{?mdkver} >= 24090000
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel

redhat/core/tdeartwork/tdeartwork.spec

@@ -90,7 +90,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/core/tdebase/tdebase.spec

@@ -241,7 +241,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	audiofile-devel
 
 # ALSA supportl
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel
@@ -443,7 +443,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/core/tdebindings/tdebindings.spec

@@ -169,7 +169,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/core/tdegraphics/tdegraphics.spec

@@ -201,7 +201,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver} >= 24090000
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/core/tdelibs/tdelibs.spec

@@ -112,7 +112,7 @@ BuildRequires:	libxslt-devel
 %endif
 
 # ALSA support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel
@@ -431,7 +431,7 @@ Requires:		udisks
 %define udisks2 udisks2
 %define udisks2_devel udisks2-devel
 %endif
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 %define udisks2 udisks
 %define udisks2_devel %{_lib}udisks-devel
 %endif

redhat/core/tdemultimedia/tdemultimedia.spec

@@ -131,7 +131,7 @@ BuildRequires:	libtheora-devel
 %endif
 
 # ALSA support
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel

redhat/dependencies/akode/akode.spec

@@ -130,7 +130,7 @@ BuildRequires:		libmad-devel
 %if 0%{?suse_version}
 BuildRequires: alsa-devel
 %else
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel

redhat/dependencies/arts/arts.spec

@@ -84,7 +84,7 @@ BuildRequires:	gsl-devel
 BuildRequires: %{libvorbis_devel}
 
 # ALSA support
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 %define alsa_devel %{_lib}asound-devel
 %else
 %define alsa_devel alsa-lib-devel

redhat/dependencies/pytqt/pytqt.spec

@@ -88,7 +88,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel

redhat/dependencies/sip4-tqt/sip4-tqt.spec

@@ -113,7 +113,7 @@ specificity towards C++ and Python.
 %files -n sip4-tqt
 %defattr(-,root,root,-)
 %{python_sitearch}/sip_tqt.so
-%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if "%{?distribution}" == "OpenMandriva Lx" || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/sip_tqt_config.py*
 %{python_sitearch}/sip_tqt_distutils.py*
 %if 0%{?rhel} == 7

redhat/dependencies/tqt3/tqt3.spec

@@ -126,7 +126,7 @@ BuildRequires: cups-devel
 # LIBAUDIO support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_nas 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if "%{?distribution}" == "OpenMandriva Lx"
 %define libaudio_devel %{_lib}audio-devel nas-devel
 %else
 %define libaudio_devel nas-devel
@@ -266,7 +266,7 @@ BuildRequires: mesa-libGLU-devel
 %if 0%{?pclinuxos}
 BuildRequires: MesaGLU-devel
 %else
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel
@@ -428,13 +428,6 @@ for building threaded TQt applications as well as the libtqui.so symlink
 and the necessary header files for libtqui.so. (See README.Debian and
 the TQt Documentation for instructions on libtqui.so)
 
-WARNING: If you plan to build some older TQt3 applications, you will
-most probably have to install the tqt3-compat-headers package. It
-contains all the headers which are not part of the official TQt3 API
-anymore but which are still used by some programs. So if you encounter
-problems with missing header files, please install this package first
-before you send a bugreport.
-
 %post -n %{libtqt3}-mt-devel
 /sbin/ldconfig || :
 
@@ -452,7 +445,6 @@ before you send a bugreport.
 %dir %{_includedir}/tqt3
 %{_includedir}/tqt3/ntqgl.h
 %{_includedir}/tqt3/ntqglcolormap.h
-%{_includedir}/tqt3/ntqwidgetfactory.h
 %{_includedir}/tqt3/actioninterface.h
 %{_includedir}/tqt3/arghintwidget.h
 %{_includedir}/tqt3/browser.h
@@ -484,7 +476,6 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqbutton.h
 %{_includedir}/tqt3/ntqbuttongroup.h
 %{_includedir}/tqt3/ntqcache.h
-%{_includedir}/tqt3/ntqcanvas.h
 %{_includedir}/tqt3/ntqcdestyle.h
 %{_includedir}/tqt3/ntqcheckbox.h
 %{_includedir}/tqt3/ntqcleanuphandler.h
@@ -498,10 +489,7 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqconnection.h
 %{_includedir}/tqt3/ntqcstring.h
 %{_includedir}/tqt3/ntqcursor.h
-%{_includedir}/tqt3/ntqdatabrowser.h
 %{_includedir}/tqt3/ntqdatastream.h
-%{_includedir}/tqt3/ntqdatatable.h
-%{_includedir}/tqt3/ntqdataview.h
 %{_includedir}/tqt3/ntqdatetime.h
 %{_includedir}/tqt3/ntqdatetimeedit.h
 %{_includedir}/tqt3/ntqdeepcopy.h
@@ -513,11 +501,9 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqdns.h
 %{_includedir}/tqt3/ntqdockarea.h
 %{_includedir}/tqt3/ntqdockwindow.h
-%{_includedir}/tqt3/ntqdom.h
 %{_includedir}/tqt3/ntqdragobject.h
 %{_includedir}/tqt3/ntqdrawutil.h
 %{_includedir}/tqt3/ntqdropsite.h
-%{_includedir}/tqt3/ntqeditorfactory.h
 %{_includedir}/tqt3/ntqerrormessage.h
 %{_includedir}/tqt3/ntqeucjpcodec.h
 %{_includedir}/tqt3/ntqeuckrcodec.h
@@ -556,10 +542,6 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqhgroupbox.h
 %{_includedir}/tqt3/ntqhostaddress.h
 %{_includedir}/tqt3/ntqhttp.h
-%{_includedir}/tqt3/ntqiconset.h
-%{_includedir}/tqt3/ntqiconview.h
-%{_includedir}/tqt3/ntqimage.h
-%{_includedir}/tqt3/ntqimageformatplugin.h
 %{_includedir}/tqt3/ntqinputcontext.h
 %{_includedir}/tqt3/ntqinputcontextfactory.h
 %{_includedir}/tqt3/ntqinputcontextplugin.h
@@ -583,7 +565,6 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqlocale.h
 %{_includedir}/tqt3/ntqlocalfs.h
 %{_includedir}/tqt3/ntqmainwindow.h
-%{_includedir}/tqt3/ntqmap.h
 %{_includedir}/tqt3/ntqmemarray.h
 %{_includedir}/tqt3/ntqmenubar.h
 %{_includedir}/tqt3/ntqmenudata.h
@@ -601,15 +582,9 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqnetwork.h
 %{_includedir}/tqt3/ntqnetworkprotocol.h
 %{_includedir}/tqt3/ntqnp.h
-%{_includedir}/tqt3/ntqobject.h
-%{_includedir}/tqt3/ntqobjectcleanuphandler.h
-%{_includedir}/tqt3/ntqobjectdefs.h
-%{_includedir}/tqt3/ntqobjectdict.h
-%{_includedir}/tqt3/ntqobjectlist.h
 %{_includedir}/tqt3/ntqpaintdevice.h
 %{_includedir}/tqt3/ntqpaintdevicemetrics.h
 %{_includedir}/tqt3/ntqpainter.h
-%{_includedir}/tqt3/ntqpair.h
 %{_includedir}/tqt3/ntqpalette.h
 %{_includedir}/tqt3/ntqpen.h
 %{_includedir}/tqt3/ntqpicture.h
@@ -626,12 +601,6 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqprocess.h
 %{_includedir}/tqt3/ntqprogressbar.h
 %{_includedir}/tqt3/ntqprogressdialog.h
-%{_includedir}/tqt3/ntqptrcollection.h
-%{_includedir}/tqt3/ntqptrdict.h
-%{_includedir}/tqt3/ntqptrlist.h
-%{_includedir}/tqt3/ntqptrqueue.h
-%{_includedir}/tqt3/ntqptrstack.h
-%{_includedir}/tqt3/ntqptrvector.h
 %{_includedir}/tqt3/ntqpushbutton.h
 %{_includedir}/tqt3/ntqradiobutton.h
 %{_includedir}/tqt3/ntqrangecontrol.h
@@ -642,7 +611,6 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqscrollbar.h
 %{_includedir}/tqt3/ntqscrollview.h
 %{_includedir}/tqt3/ntqsemaphore.h
-%{_includedir}/tqt3/ntqsemimodal.h
 %{_includedir}/tqt3/ntqserversocket.h
 %{_includedir}/tqt3/ntqsession.h
 %{_includedir}/tqt3/ntqsessionmanager.h
@@ -661,48 +629,17 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqsocket.h
 %{_includedir}/tqt3/ntqsocketdevice.h
 %{_includedir}/tqt3/ntqsocketnotifier.h
-%{_includedir}/tqt3/ntqsortedlist.h
 %{_includedir}/tqt3/ntqsound.h
 %{_includedir}/tqt3/ntqspinbox.h
 %{_includedir}/tqt3/ntqsplashscreen.h
 %{_includedir}/tqt3/ntqsplitter.h
-%{_includedir}/tqt3/ntqsql.h
-%{_includedir}/tqt3/ntqsqlcursor.h
-%{_includedir}/tqt3/ntqsqldatabase.h
-%{_includedir}/tqt3/ntqsqldriver.h
-%{_includedir}/tqt3/ntqsqldriverplugin.h
-%{_includedir}/tqt3/ntqsqleditorfactory.h
-%{_includedir}/tqt3/ntqsqlerror.h
-%{_includedir}/tqt3/ntqsqlfield.h
-%{_includedir}/tqt3/ntqsqlform.h
-%{_includedir}/tqt3/ntqsqlindex.h
-%{_includedir}/tqt3/ntqsqlpropertymap.h
-%{_includedir}/tqt3/ntqsqlquery.h
-%{_includedir}/tqt3/ntqsqlrecord.h
-%{_includedir}/tqt3/ntqsqlresult.h
-%{_includedir}/tqt3/ntqsqlselectcursor.h
 %{_includedir}/tqt3/ntqstatusbar.h
-%{_includedir}/tqt3/ntqstring.h
-%{_includedir}/tqt3/ntqstringlist.h
-%{_includedir}/tqt3/ntqstrlist.h
-%{_includedir}/tqt3/ntqstrvec.h
-%{_includedir}/tqt3/ntqstyle.h
-%{_includedir}/tqt3/ntqstylefactory.h
-%{_includedir}/tqt3/ntqstyleplugin.h
-%{_includedir}/tqt3/ntqstylesheet.h
 %{_includedir}/tqt3/ntqsyntaxhighlighter.h
 %{_includedir}/tqt3/ntqt.h
 %{_includedir}/tqt3/ntqtabbar.h
 %{_includedir}/tqt3/ntqtabdialog.h
 %{_includedir}/tqt3/ntqtable.h
 %{_includedir}/tqt3/ntqtabwidget.h
-%{_includedir}/tqt3/ntqtextbrowser.h
-%{_includedir}/tqt3/ntqtextcodec.h
-%{_includedir}/tqt3/ntqtextcodecfactory.h
-%{_includedir}/tqt3/ntqtextcodecplugin.h
-%{_includedir}/tqt3/ntqtextedit.h
-%{_includedir}/tqt3/ntqtextstream.h
-%{_includedir}/tqt3/ntqtextview.h
 %{_includedir}/tqt3/ntqthread.h
 %{_includedir}/tqt3/ntqthreadstorage.h
 %{_includedir}/tqt3/ntqtimer.h
@@ -719,9 +656,6 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqutfcodec.h
 %{_includedir}/tqt3/ntquuid.h
 %{_includedir}/tqt3/ntqvalidator.h
-%{_includedir}/tqt3/ntqvaluelist.h
-%{_includedir}/tqt3/ntqvaluestack.h
-%{_includedir}/tqt3/ntqvaluevector.h
 %{_includedir}/tqt3/ntqvariant.h
 %{_includedir}/tqt3/ntqvbox.h
 %{_includedir}/tqt3/ntqvbuttongroup.h
@@ -729,18 +663,12 @@ before you send a bugreport.
 %{_includedir}/tqt3/ntqvgroupbox.h
 %{_includedir}/tqt3/ntqwaitcondition.h
 %{_includedir}/tqt3/ntqwhatsthis.h
-%{_includedir}/tqt3/ntqwidget.h
-%{_includedir}/tqt3/ntqwidgetintdict.h
-%{_includedir}/tqt3/ntqwidgetlist.h
-%{_includedir}/tqt3/ntqwidgetplugin.h
-%{_includedir}/tqt3/ntqwidgetstack.h
 %{_includedir}/tqt3/ntqwindowdefs.h
 %{_includedir}/tqt3/ntqwindowsstyle.h
 %{_includedir}/tqt3/ntqwinexport.h
 %{_includedir}/tqt3/ntqwizard.h
 %{_includedir}/tqt3/ntqwmatrix.h
 %{_includedir}/tqt3/ntqworkspace.h
-%{_includedir}/tqt3/ntqxml.h
 %{_includedir}/tqt3/paragdata.h
 %{_includedir}/tqt3/parenmatcher.h
 %{_includedir}/tqt3/preferenceinterface.h
@@ -752,16 +680,80 @@ before you send a bugreport.
 %{_includedir}/tqt3/qconfig-medium.h
 %{_includedir}/tqt3/qconfig-minimal.h
 %{_includedir}/tqt3/qconfig-small.h
-%{_includedir}/tqt3/qsql_ibase.h
-%{_includedir}/tqt3/qsql_mysql.h
-%{_includedir}/tqt3/qsql_odbc.h
-%{_includedir}/tqt3/qsql_psql.h
-%{_includedir}/tqt3/qsql_sqlite.h
-%{_includedir}/tqt3/qsql_sqlite3.h
-%{_includedir}/tqt3/qsqlcachedresult.h
 %{_includedir}/tqt3/qt_pch.h
 %{_includedir}/tqt3/qwindow.h
 %{_includedir}/tqt3/sourcetemplateiface.h
+%{_includedir}/tqt3/tqcanvas.h
+%{_includedir}/tqt3/tqdatabrowser.h
+%{_includedir}/tqt3/tqdatatable.h
+%{_includedir}/tqt3/tqdataview.h
+%{_includedir}/tqt3/tqdom.h
+%{_includedir}/tqt3/tqeditorfactory.h
+%{_includedir}/tqt3/tqiconset.h
+%{_includedir}/tqt3/tqiconview.h
+%{_includedir}/tqt3/tqimage.h
+%{_includedir}/tqt3/tqimageformatplugin.h
+%{_includedir}/tqt3/tqmap.h
+%{_includedir}/tqt3/tqobject.h
+%{_includedir}/tqt3/tqobjectcleanuphandler.h
+%{_includedir}/tqt3/tqobjectdefs.h
+%{_includedir}/tqt3/tqobjectdict.h
+%{_includedir}/tqt3/tqobjectlist.h
+%{_includedir}/tqt3/tqpair.h
+%{_includedir}/tqt3/tqptrcollection.h
+%{_includedir}/tqt3/tqptrdict.h
+%{_includedir}/tqt3/tqptrlist.h
+%{_includedir}/tqt3/tqptrqueue.h
+%{_includedir}/tqt3/tqptrstack.h
+%{_includedir}/tqt3/tqptrvector.h
+%{_includedir}/tqt3/tqsql.h
+%{_includedir}/tqt3/tqsql_ibase.h
+%{_includedir}/tqt3/tqsql_mysql.h
+%{_includedir}/tqt3/tqsql_odbc.h
+%{_includedir}/tqt3/tqsql_psql.h
+%{_includedir}/tqt3/tqsql_sqlite.h
+%{_includedir}/tqt3/tqsql_sqlite3.h
+%{_includedir}/tqt3/tqsqlcachedresult.h
+%{_includedir}/tqt3/tqsqlcursor.h
+%{_includedir}/tqt3/tqsqldatabase.h
+%{_includedir}/tqt3/tqsqldriver.h
+%{_includedir}/tqt3/tqsqldriverplugin.h
+%{_includedir}/tqt3/tqsqleditorfactory.h
+%{_includedir}/tqt3/tqsqlerror.h
+%{_includedir}/tqt3/tqsqlfield.h
+%{_includedir}/tqt3/tqsqlform.h
+%{_includedir}/tqt3/tqsqlindex.h
+%{_includedir}/tqt3/tqsqlpropertymap.h
+%{_includedir}/tqt3/tqsqlquery.h
+%{_includedir}/tqt3/tqsqlrecord.h
+%{_includedir}/tqt3/tqsqlresult.h
+%{_includedir}/tqt3/tqsqlselectcursor.h
+%{_includedir}/tqt3/tqstring.h
+%{_includedir}/tqt3/tqstringlist.h
+%{_includedir}/tqt3/tqstrlist.h
+%{_includedir}/tqt3/tqstrvec.h
+%{_includedir}/tqt3/tqstyle.h
+%{_includedir}/tqt3/tqstylefactory.h
+%{_includedir}/tqt3/tqstyleplugin.h
+%{_includedir}/tqt3/tqstylesheet.h
+%{_includedir}/tqt3/tqt.h
+%{_includedir}/tqt3/tqtextbrowser.h
+%{_includedir}/tqt3/tqtextcodec.h
+%{_includedir}/tqt3/tqtextcodecfactory.h
+%{_includedir}/tqt3/tqtextcodecplugin.h
+%{_includedir}/tqt3/tqtextedit.h
+%{_includedir}/tqt3/tqtextstream.h
+%{_includedir}/tqt3/tqtextview.h
+%{_includedir}/tqt3/tqvaluelist.h
+%{_includedir}/tqt3/tqvaluestack.h
+%{_includedir}/tqt3/tqvaluevector.h
+%{_includedir}/tqt3/tqwidget.h
+%{_includedir}/tqt3/tqwidgetfactory.h
+%{_includedir}/tqt3/tqwidgetintdict.h
+%{_includedir}/tqt3/tqwidgetlist.h
+%{_includedir}/tqt3/tqwidgetplugin.h
+%{_includedir}/tqt3/tqwidgetstack.h
+%{_includedir}/tqt3/tqxml.h
 %{_includedir}/tqt3/templatewizardiface.h
 %{_includedir}/tqt3/viewmanager.h
 %{_includedir}/tqt3/widgetinterface.h
@@ -873,73 +865,6 @@ SQLite3 DB.
 
 ###########
 
-%package -n tqt3-compat-headers
-Summary:	TQt 1.x and 2.x compatibility includes
-Group:		Development/Libraries/X11
-Requires:	%{libtqt3}-mt = %{version}-%{release}
-
-%description -n tqt3-compat-headers
-This package contains header files that are intended for build
-compatibility for applications that build with TQt3 but still use
-deprecated includes. It is meant as an intermediate solution and
-these header files are not part of the official TQt3 API.
-All sourcecode that is still using the headers of this package is
-subject to be changed to use the new header files which are in
-libtqt3-headers.
-
-%files -n tqt3-compat-headers
-%defattr(-,root,root,-)
-%{_includedir}/tqt3/ntqapp.h
-%{_includedir}/tqt3/ntqarray.h
-%{_includedir}/tqt3/ntqbitarry.h
-%{_includedir}/tqt3/ntqbttngrp.h
-%{_includedir}/tqt3/ntqchkbox.h
-%{_includedir}/tqt3/ntqclipbrd.h
-%{_includedir}/tqt3/ntqcollect.h
-%{_includedir}/tqt3/ntqcollection.h
-%{_includedir}/tqt3/ntqcombo.h
-%{_includedir}/tqt3/ntqconnect.h
-%{_includedir}/tqt3/ntqdatetm.h
-%{_includedir}/tqt3/ntqdrawutl.h
-%{_includedir}/tqt3/ntqdstream.h
-%{_includedir}/tqt3/ntqfiledef.h
-%{_includedir}/tqt3/ntqfiledlg.h
-%{_includedir}/tqt3/ntqfileinf.h
-%{_includedir}/tqt3/ntqfontinf.h
-%{_includedir}/tqt3/ntqfontmet.h
-%{_includedir}/tqt3/ntqgrpbox.h
-%{_includedir}/tqt3/ntqintcach.h
-%{_includedir}/tqt3/ntqiodev.h
-%{_includedir}/tqt3/ntqlcdnum.h
-%{_includedir}/tqt3/ntqlined.h
-%{_includedir}/tqt3/ntqmenudta.h
-%{_includedir}/tqt3/ntqmetaobj.h
-%{_includedir}/tqt3/ntqmlined.h
-%{_includedir}/tqt3/ntqmsgbox.h
-%{_includedir}/tqt3/ntqmultilinedit.h
-%{_includedir}/tqt3/ntqobjcoll.h
-%{_includedir}/tqt3/ntqobjdefs.h
-%{_includedir}/tqt3/ntqpdevmet.h
-%{_includedir}/tqt3/ntqpmcache.h
-%{_includedir}/tqt3/ntqpntarry.h
-%{_includedir}/tqt3/ntqpopmenu.h
-%{_includedir}/tqt3/ntqprndlg.h
-%{_includedir}/tqt3/ntqprogbar.h
-%{_includedir}/tqt3/ntqprogdlg.h
-%{_includedir}/tqt3/ntqpsprn.h
-%{_includedir}/tqt3/ntqpushbt.h
-%{_includedir}/tqt3/ntqqueue.h
-%{_includedir}/tqt3/ntqradiobt.h
-%{_includedir}/tqt3/ntqrangect.h
-%{_includedir}/tqt3/ntqscrbar.h
-%{_includedir}/tqt3/ntqsocknot.h
-%{_includedir}/tqt3/ntqtabdlg.h
-%{_includedir}/tqt3/ntqtstream.h
-%{_includedir}/tqt3/ntqwidcoll.h
-%{_includedir}/tqt3/ntqwindefs.h
-
-###########
-
 %package -n tqt3-dev-tools
 Summary:	TQt3 development tools
 Group:		Development/Libraries/X11
@@ -1198,7 +1123,7 @@ Group:		System/GUI/Other
 Requires:	%{libtqt3}-mt-devel = %{version}-%{release}
 
 %description -n tqt3-dev-tools-compat
-This package contains some older TQt tools (namely tqtrename140,
+This package contains some older TQt tools (namely
 tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by
 application developers who need to migrate any TQt application written
 for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to
@@ -1208,7 +1133,6 @@ translation system to the TQt 3 system.
 
 %files -n tqt3-dev-tools-compat
 %defattr(-,root,root,-)
-%{_bindir}/tqtrename140
 %{_bindir}/tqm2ts
 %{_bindir}/tqtmergetr
 %{_bindir}/tqtfindtr
@@ -1467,7 +1391,6 @@ export LD_LIBRARY_PATH=${QTDIR}/lib
 %__make INSTALL_ROOT=%{?buildroot} install
 %__make INSTALL_ROOT=%{?buildroot} plugins-install
 
-%__install -m755 "bin/tqtrename140" "%{?buildroot}%{_bindir}"
 %__install -m755 "bin/tqtfindtr" "%{?buildroot}%{_bindir}"
 
 # install tqtconv2ui

redhat/dependencies/tqtinterface/tqtinterface.spec

@@ -97,7 +97,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if "%{?distribution}" == "OpenMandriva Lx"
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel
@@ -187,17 +187,7 @@ although some code has been added for useful functions that are no longer part o
 
 %files -n %{libtqt4}-devel
 %defattr(-,root,root,-)
-%{_bindir}/convert_qt_tqt1
-%{_bindir}/convert_qt_tqt2
-%{_bindir}/convert_qt_tqt3
-%{_bindir}/dcopidl-tqt
-%{_bindir}/dcopidl2cpp-tqt
-%{_bindir}/dcopidlng-tqt
-%{_bindir}/mcopidl-tqt
-%{_bindir}/moc-tqt
 %{_bindir}/tmoc
-%{_bindir}/tqt-replace
-%{_bindir}/uic-tqt
 %{_includedir}/tqt/
 %{_libdir}/libtqt.la
 %{_libdir}/libtqt.so