From 1f76bf54b70463addf27bc503bb58af60dc8ae58 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 2 Aug 2012 13:37:56 +0200 Subject: RHEL/Fedora/MGA2: fix some packaging dependencies issues --- redhat/kdegames/trinity-kdegames-3.5.13.spec | 7 ++++--- redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec | 12 +++++++----- redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec | 18 ++++++++++-------- redhat/kdepim/trinity-kdepim-3.5.13.spec | 9 +++++---- 4 files changed, 26 insertions(+), 20 deletions(-) (limited to 'redhat') diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec index ea34048ac..80271fe56 100644 --- a/redhat/kdegames/trinity-kdegames-3.5.13.spec +++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec @@ -46,6 +46,7 @@ BuildRequires: libtool BuildRequires: tqtinterface-devel >= 3.5.13 BuildRequires: trinity-arts-devel >= 3.5.13 +BuildRequires: trinity-tdemultimedia-devel >= 3.5.13 BuildRequires: qt3-devel >= 3.3.8.d Obsoletes: trinity-kdegames < %{version}-%{release} @@ -72,7 +73,6 @@ Requires: trinity-kmahjongg = %{version}-%{release} Requires: trinity-kmines = %{version}-%{release} Requires: trinity-knetwalk = %{version}-%{release} Requires: trinity-kolf = %{version}-%{release} -Requires: trinity-kolf-devel = %{version}-%{release} Requires: trinity-konquest = %{version}-%{release} Requires: trinity-kpat = %{version}-%{release} Requires: trinity-kpoker = %{version}-%{release} @@ -109,6 +109,7 @@ Requires: %{name} = %{version}-%{release} Requires: trinity-tdelibs-devel >= 3.5.13 Requires: trinity-libtdegames-devel = %{version}-%{release} Requires: trinity-atlantik-devel = %{version}-%{release} +Requires: trinity-kolf-devel = %{version}-%{release} Obsoletes: trinity-kdegames-devel < %{version}-%{release} Provides: trinity-kdegames-devel = %{version}-%{release} @@ -142,8 +143,6 @@ This package is part of TDE, and a component of the TDE games module. %{tde_datadir}/apps/[kt]degames/pics/star.png %{tde_datadir}/icons/crystalsvg/*/actions/roll.png %{tde_datadir}/icons/crystalsvg/*/actions/highscore.png -%{tde_libdir}/lib[kt]degames.so -%{tde_libdir}/lib[kt]degames.la %{tde_tdedocdir}/HTML/en/[kt]degames-apidocs/ %post -n trinity-libtdegames1 @@ -177,6 +176,8 @@ This package is part of Trinity, and a component of the TDE games module. %defattr(-,root,root,-) %{tde_tdeincludedir}/*.h %{tde_tdeincludedir}/kgame +%{tde_libdir}/lib[kt]degames.so +%{tde_libdir}/lib[kt]degames.la ########## diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index ce0c07157..780b0f1d5 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -59,9 +59,9 @@ Patch8: kdegraphics-3.5.13-add_poppler_tqt_pc.patch Patch9: kdegraphics-3.5.13-fix_poppler_include_dir.patch BuildRequires: cmake >= 2.8 -BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: tqtinterface-devel >= 3.5.13 +BuildRequires: trinity-tdelibs-devel >= 3.5.13 +BuildRequires: trinity-tdebase-devel >= 3.5.13 BuildRequires: gettext BuildRequires: libmng-devel BuildRequires: libpng-devel @@ -365,8 +365,6 @@ kfax application once it reproduces all of kfax's features. %defattr(-,root,root,-) %{tde_bindir}/kfaxview %{tde_libdir}/libkfaximage.so.* -%{tde_libdir}/libkfaximage.so -%{tde_libdir}/libkfaximage.la %{tde_tdelibdir}/kfaxviewpart.* %{tde_tdeappdir}/kfaxview.desktop %{tde_datadir}/apps/kfaxview/ @@ -869,6 +867,10 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release} %{tde_libdir}/libksvg.so %{tde_libdir}/libtext2path.la %{tde_libdir}/libtext2path.so +# kfaxview +%{tde_libdir}/libkfaximage.so +%{tde_libdir}/libkfaximage.la +# cmake %{tde_datadir}/cmake/* ############ diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec index 85966f4e3..408a596e5 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec @@ -737,8 +737,6 @@ This package contains akode plugins for aRts. %files -n trinity-libarts-akode %defattr(-,root,root,-) -%{tde_libdir}/libarts_akode.la -%{tde_libdir}/libarts_akode.so %{tde_libdir}/libarts_akode.so.* %{tde_libdir}/mcop/akodearts.mcoptype %{tde_libdir}/mcop/akodearts.mcopclass @@ -748,6 +746,8 @@ This package contains akode plugins for aRts. %{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass %{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass +# -devel + %post -n trinity-libarts-akode /sbin/ldconfig @@ -765,8 +765,6 @@ This package contains audiofile plugins for aRts. %files -n trinity-libarts-audiofile %defattr(-,root,root,-) -%{tde_libdir}/libarts_audiofile.la -%{tde_libdir}/libarts_audiofile.so %{tde_libdir}/libarts_audiofile.so.* %{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass %{tde_libdir}/mcop/audiofilearts.mcopclass @@ -794,8 +792,6 @@ This is the arts (TDE Sound daemon) plugin. %defattr(-,root,root,-) %{tde_bindir}/mpeglibartsplay %{tde_libdir}/libarts_mpeglib-0.3.0.so.* -%{tde_libdir}/libarts_mpeglib.la -%{tde_libdir}/libarts_splay.la %{tde_libdir}/libarts_splay.so.* %{tde_libdir}/mcop/CDDAPlayObject.mcopclass %{tde_libdir}/mcop/MP3PlayObject.mcopclass @@ -824,8 +820,6 @@ multimedia engine though aRts. %defattr(-,root,root,-) %{tde_tdelibdir}/videothumbnail.la %{tde_tdelibdir}/videothumbnail.so -%{tde_libdir}/libarts_xine.la -%{tde_libdir}/libarts_xine.so %{tde_libdir}/libarts_xine.so.* %{tde_libdir}/mcop/xineAudioPlayObject.mcopclass %{tde_libdir}/mcop/xineVideoPlayObject.mcopclass @@ -1018,8 +1012,16 @@ noatun plugins. %files devel %defattr(-,root,root,-) %{tde_includedir}/* +%{tde_libdir}/libarts_akode.la +%{tde_libdir}/libarts_akode.so +%{tde_libdir}/libarts_audiofile.la +%{tde_libdir}/libarts_audiofile.so +%{tde_libdir}/libarts_mpeglib.la %{tde_libdir}/libarts_mpeglib.so +%{tde_libdir}/libarts_splay.la %{tde_libdir}/libarts_splay.so +%{tde_libdir}/libarts_xine.la +%{tde_libdir}/libarts_xine.so %{tde_libdir}/libartsbuilder.so %{tde_libdir}/libartscontrolapplet.so %{tde_libdir}/libartscontrolsupport.so diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec index ad4a29f14..ba06d01ee 100644 --- a/redhat/kdepim/trinity-kdepim-3.5.13.spec +++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec @@ -920,9 +920,10 @@ mbox files, and/or trinity-tdebase-kio-plugins if you want to use POP3. %{tde_datadir}/services/kontact/kmailplugin.desktop %{tde_datadir}/servicetypes/dcopimap.desktop %{tde_datadir}/servicetypes/dcopmail.desktop +# 'libkmailprivate.so' is required at runtime, not devel ! +%{tde_libdir}/libkmailprivate.so +%{tde_libdir}/libkmailprivate.la %{tde_tdedocdir}/HTML/en/kmail/ -%{tde_tdeincludedir}/kmail/ -%{tde_tdeincludedir}/kmail*.h %post -n trinity-kmail for f in crystalsvg hicolor ; do @@ -950,8 +951,8 @@ Group: Development/Libraries %{summary} %files -n trinity-kmail-devel -%{tde_libdir}/libkmailprivate.la -%{tde_libdir}/libkmailprivate.so +%{tde_tdeincludedir}/kmail/ +%{tde_tdeincludedir}/kmail*.h %post -n trinity-kmail-devel /sbin/ldconfig || : -- cgit v1.2.3