RPM: fix invalid dependencies to devel packages

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

5 files changed, 96 insertions, 26 deletions

diff --git a/redhat/applications/development/kxmleditor/kxmleditor.spec b/redhat/applications/development/kxmleditor/kxmleditor.spec
index e380101ae..6ccd630e9 100644
--- a/redhat/applications/development/kxmleditor/kxmleditor.spec
+++ b/redhat/applications/development/kxmleditor/kxmleditor.spec
@@ -87,6 +87,21 @@ contents.
 
 ##########
 
+%package devel
+Group:			Applications/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:		XML Editor for TDE (development files)
+
+%description devel
+Development files for KXMLEditor.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkxmleditorpart.la
+%{tde_libdir}/libkxmleditorpart.so
+
+##########
+
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
@@ -143,8 +158,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/kxmleditor
-%{tde_libdir}/libkxmleditorpart.la
-%{tde_libdir}/libkxmleditorpart.so
 %{tde_libdir}/libkxmleditorpart.so.1
 %{tde_libdir}/libkxmleditorpart.so.1.0.0
 %{tde_tdeappdir}/kxmleditor.desktop
diff --git a/redhat/applications/multimedia/kmplayer/kmplayer.spec b/redhat/applications/multimedia/kmplayer/kmplayer.spec
index 74db046b5..250ac7f5b 100644
--- a/redhat/applications/multimedia/kmplayer/kmplayer.spec
+++ b/redhat/applications/multimedia/kmplayer/kmplayer.spec
@@ -202,8 +202,6 @@ Core files needed for KMPlayer.
 
 %files base
 %defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
 %dir %{tde_datadir}/config
@@ -254,6 +252,21 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 
 ##########
 
+%package devel
+Group:			Applications/Multimedia
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:		Media player for Trinity (devlopment files)
+
+%description devel
+Development files for KMPlayer, a basic audio/video viewer application for TDE.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libkmplayercommon.la
+%{tde_libdir}/libkmplayercommon.so
+
+##########
+
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
diff --git a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
index ce227d406..9e8b23e0a 100644
--- a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
+++ b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec
@@ -86,6 +86,34 @@ BuildRequires:	gtk+3.0-devel
 %description
 GTK3 style engine which uses the active TDE style to draw its widgets
 
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING
+%{tde_libdir}/libtqtcairo.so.0
+%{tde_libdir}/libtqtcairo.so.0.0.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
+%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
+%dir %{_datadir}/themes/tdegtk
+%dir %{_datadir}/themes/tdegtk/gtk-3.0
+%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
+
+##########
+
+%package devel
+Summary:		Files for the development of applications which will use %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}.
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_libdir}/libtqtcairo.la
+%{tde_libdir}/libtqtcairo.so
+
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -142,20 +170,4 @@ fi
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_libdir}/libtqtcairo.la
-%{tde_libdir}/libtqtcairo.so
-%{tde_libdir}/libtqtcairo.so.0
-%{tde_libdir}/libtqtcairo.so.0.0.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.la
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0
-%{_libdir}/gtk-3.0/3.0.0/theming-engines/libtdegtk.so.0.0.0
-%dir %{_datadir}/themes/tdegtk
-%dir %{_datadir}/themes/tdegtk/gtk-3.0
-%{_datadir}/themes/tdegtk/gtk-3.0/gtk.css
-
-
 %changelog
diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec
index 08056f129..13b679bbd 100644
--- a/redhat/core/tdemultimedia/tdemultimedia.spec
+++ b/redhat/core/tdemultimedia/tdemultimedia.spec
@@ -787,6 +787,7 @@ This package contains audiofile plugins for aRts.
 ##########
 
 %if 0%{?with_mpeg}
+
 %package -n trinity-libarts-mpeglib
 Summary:	Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video
 Group:		Productivity/Multimedia/Other
@@ -800,7 +801,7 @@ This is the arts (TDE Sound daemon) plugin.
 %files -n trinity-libarts-mpeglib
 %defattr(-,root,root,-)
 %{tde_bindir}/mpeglibartsplay
-%{tde_libdir}/libarts_mpeglib-0.3.0.so*
+%{tde_libdir}/libarts_mpeglib-0.3.0.so.*
 %{tde_libdir}/libarts_mpeglib.la
 %{tde_libdir}/libarts_splay.so.*
 %{tde_libdir}/libarts_splay.la
@@ -1004,6 +1005,7 @@ noatun plugins.
 %{tde_libdir}/libarts_audiofile.so
 %if 0%{?with_mpeg}
 %{tde_libdir}/libarts_mpeglib.so
+%{tde_libdir}/libarts_mpeglib-0.3.0.so
 %{tde_libdir}/libarts_splay.so
 %endif
 %if 0%{?with_xine}
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 4d79d2247..4039a0c1e 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -298,6 +298,10 @@ BuildRequires:		libtirpc-devel
 BuildRequires:		libnsl-devel
 BuildRequires:		libtirpc-devel
 %endif
+%if 0%{?mgaversion}
+BuildRequires:		%{_lib}nsl-devel
+BuildRequires:		%{_lib}tirpc-devel
+%endif
 
 # x86_64 specific stuff
 %if "%{_lib}" != "lib"
@@ -1005,6 +1009,7 @@ or automake.
 Summary:	TQt3 Developer applications development files
 Group:		Development/Libraries/X11
 Requires:	%{libtqt3}-mt-devel = %{version}-%{release}
+Requires:	tqt3-apps-libs = %{version}-%{release}
 
 %description -n tqt3-apps-devel
 This package is intended for developers who want to develop applications
@@ -1025,20 +1030,45 @@ developer includes with his application.
 %defattr(-,root,root,-)
 %{_libdir}/libtqtdesignercore.prl
 %{_libdir}/libtqtdesignercore.so
+%{_libdir}/libtqteditor.prl
+%{_libdir}/libtqteditor.so
+%{_libdir}/libtqassistantclient.prl
+%{_libdir}/libtqassistantclient.so
+%{_includedir}/tqt3/ntqassistantclient.h
+
+###########
+
+%package -n tqt3-apps-libs
+Summary:	TQt3 Developer applications libraries
+Group:		Development/Libraries/X11
+Requires:	%{libtqt3}-mt = %{version}-%{release}
+
+%description -n tqt3-apps-libs
+This package is intended for developers who want to develop applications
+using the additional static libraries that ship with the applications
+included with TQt; the TQt Designer and the TQt Assistant.
+It allows integrating additional enhancements into the TQt Designer
+respectively faciliate the TQt Assistant from within your TQt application
+to interactively call the Assistant for displaying online help that the
+developer includes with his application.
+
+%post -n tqt3-apps-libs
+/sbin/ldconfig || :
+
+%postun -n tqt3-apps-libs
+/sbin/ldconfig || :
+
+%files -n tqt3-apps-libs
+%defattr(-,root,root,-)
 %{_libdir}/libtqtdesignercore.so.1
 %{_libdir}/libtqtdesignercore.so.1.0
 %{_libdir}/libtqtdesignercore.so.1.0.0
-%{_libdir}/libtqteditor.prl
-%{_libdir}/libtqteditor.so
 %{_libdir}/libtqteditor.so.1
 %{_libdir}/libtqteditor.so.1.0
 %{_libdir}/libtqteditor.so.1.0.0
-%{_libdir}/libtqassistantclient.prl
-%{_libdir}/libtqassistantclient.so
 %{_libdir}/libtqassistantclient.so.1
 %{_libdir}/libtqassistantclient.so.1.0
 %{_libdir}/libtqassistantclient.so.1.0.0
-%{_includedir}/tqt3/ntqassistantclient.h
 
 ##########