diff options
Diffstat (limited to 'redhat/extras')
| -rw-r--r-- | redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch | 15 | ||||
| -rw-r--r-- | redhat/extras/akode/trinity-akode.spec | 9 | ||||
| -rw-r--r-- | redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch (renamed from redhat/extras/kasablanca/kasablanca-autotools.patch) | 0 | ||||
| -rw-r--r-- | redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch (renamed from redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch) | 6 | ||||
| -rw-r--r-- | redhat/extras/kasablanca/trinity-kasablanca.spec | 92 | ||||
| -rw-r--r-- | redhat/extras/kdebluetooth/trinity-kdebluetooth.spec | 152 | ||||
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-desktop.spec | 134 |
7 files changed, 307 insertions, 101 deletions
diff --git a/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch b/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch new file mode 100644 index 000000000..d16411ed7 --- /dev/null +++ b/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch @@ -0,0 +1,15 @@ +--- a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ORI 2012-08-04 22:36:12.435734576 +0200 ++++ a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2012-08-04 22:37:20.153030459 +0200 +@@ -26,9 +26,9 @@ + #include "decoder.h" + + #include <assert.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avio.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavformat/avio.h> + + #include "ffmpeg_decoder.h" + #include <iostream> diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec index 6579f7bef..88875ec99 100644 --- a/redhat/extras/akode/trinity-akode.spec +++ b/redhat/extras/akode/trinity-akode.spec @@ -41,6 +41,7 @@ Patch4: akode-2.0.2-gcc43.patch # New patch for Fedora 16 / TDE 3.5.13 Patch10: akode-autotools.patch +Patch11: akode-2.0.2-fix_ffmpeg_include.patch # Optional features that are always enabled :-) %define _with_flac --with-flac @@ -122,6 +123,7 @@ Requires: %{name} = %{version}-%{release} %patch4 -p1 -b .gcc43 %patch10 -p1 +%patch11 -p1 -b .ffmpeg # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -142,7 +144,7 @@ Requires: %{name} = %{version}-%{release} --disable-static \ --enable-shared \ --disable-debug --disable-warnings --disable-dependency-tracking \ - --with-libltdl \ + --without-libltdl \ --with-alsa \ --with-oss \ %{?_with_flac} %{!?_with_flac:--without-flac} \ @@ -204,6 +206,11 @@ done %{tde_libdir}/libakode_xiph_decoder.la %{tde_libdir}/libakode_xiph_decoder.so +#files -libmad +# /opt/trinity/lib64/libakode_mpeg_decoder.la +# /opt/trinity/lib64/libakode_mpeg_decoder.so + + %files devel %defattr(-,root,root,-) %{tde_bindir}/akode-config diff --git a/redhat/extras/kasablanca/kasablanca-autotools.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch index 0eae8f419..0eae8f419 100644 --- a/redhat/extras/kasablanca/kasablanca-autotools.patch +++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch index 6596d894a..24330fa2d 100644 --- a/redhat/extras/kasablanca/kasablanca-0.4.0.2-ftbfs.patch +++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-missing_ldflags.patch @@ -1,11 +1,11 @@ ---- kasablanca-0.4.0.2/src/Makefile.am.ORI 2011-12-04 15:42:39.245402912 +0100 -+++ kasablanca-0.4.0.2/src/Makefile.am 2011-12-04 15:42:45.744265760 +0100 +--- kasablanca-0.4.0.2/src/Makefile.am.ORI 2012-08-07 15:52:01.549962016 +0200 ++++ kasablanca-0.4.0.2/src/Makefile.am 2012-08-07 15:52:11.265930503 +0200 @@ -22,7 +22,7 @@ # the application source, library search path, and link libraries kasablanca_SOURCES = main.cpp kasablanca.cpp bookmarkdialog.cpp customconnectdialog.cpp fileexistsdialog.cpp kbitem.cpp Q_bookmarkdialog.ui Q_fileexistsdialog.ui Q_mainwindow.ui eventhandler.cpp ftpthread.cpp ftplib.cpp ftpsession.cpp kbfileinfo.cpp kbdirinfo.cpp kbdir.cpp kbfile.cpp kbtransferitem.cpp kbtransferdir.cpp kbtransferfile.cpp kbconfig.kcfgc Q_colorspreferencesdialog.ui Q_generalpreferencesdialog.ui kbtaskview.cpp Q_userinterfacepreferencesdialog.ui kbbookmarkitem.cpp kbsiteinfo.cpp Q_customconnectdialog.ui Q_importdialog.ui importdialog.cpp kbstatustip.cpp kasablanca_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kasablanca_LDADD = -lssl $(LIB_KDEUI) -+kasablanca_LDADD = -lssl $(LIB_KDEUI) -lcrypto ++kasablanca_LDADD = -lssl $(LIB_KDEUI) -lcrypto $(LIB_KDECORE) -lDCOP $(LIB_QT) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/extras/kasablanca/trinity-kasablanca.spec b/redhat/extras/kasablanca/trinity-kasablanca.spec index 4604d7491..16c5f61ce 100644 --- a/redhat/extras/kasablanca/trinity-kasablanca.spec +++ b/redhat/extras/kasablanca/trinity-kasablanca.spec @@ -1,16 +1,30 @@ +%define kdecomp kasablanca + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif -%define kdecomp kasablanca -%define tde_docdir %{_docdir}/kde +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + Name: trinity-%{kdecomp} Summary: Graphical FTP client Version: 0.4.0.2 -Release: 1%{?dist} +Release: 1%{?dist}%{?_variant} License: GPLv2+ Url: http://kasablanca.berlios.de/ @@ -18,13 +32,16 @@ Source: http://download.berlios.de/kasablanca/kasablanca-%{version}.tar.gz Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# [kasablanca] Fix bad content in icon (?) Patch1: kasablanca-0.4.0.2-dt.patch -Patch2: kasablanca-autotools.patch -Patch3: kasablanca-0.4.0.2-ftbfs.patch +# [kasablanca] Fix detection of newer autotools +Patch2: kasablanca-0.4.0.2-fix_autotools_detection.patch +# [kasablanca] Missing LDFLAGS cause FTBFS +Patch3: kasablanca-0.4.0.2-missing_ldflags.patch BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-tdelibs-devel BuildRequires: openssl-devel BuildRequires: libutempter-devel @@ -43,13 +60,13 @@ Kasablanca is an ftp client, among its features are currently: %setup -q -n %{kdecomp}-%{version} %patch1 -p1 -b .dt %patch2 -p1 -%patch3 -p1 +%patch3 -p1 -b .ldflags # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -58,8 +75,10 @@ Kasablanca is an ftp client, among its features are currently: %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +export KDEDIR=%{tde_prefix} ## Needed(?) for older/legacy setups, harmless otherwise if pkg-config openssl ; then @@ -67,31 +86,36 @@ if pkg-config openssl ; then fi %configure \ - --disable-rpath \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_includedir} \ + --datadir=%{tde_datadir} \ + --disable-static \ + --disable-rpath \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + --with-extra-includes=%{tde_includedir}/tqt -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} LIBTOOL=$(which libtool) %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --dir $RPM_BUILD_ROOT%{tde_datadir}/applications/kde \ --vendor="" \ --add-category="Network" \ --add-category="KDE" \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop + $RPM_BUILD_ROOT%{tde_datadir}/applnk/*/*.desktop ## File lists -# locale's -%find_lang %{kdecomp} || touch %{kdecomp}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then @@ -109,33 +133,35 @@ for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do done fi +# locale's +%find_lang %{kdecomp} %clean %__rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : +touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : %postun if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &> /dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : + gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : fi %posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/* -%{_datadir}/applications/kde/*.desktop -%{_datadir}/apps/kasablanca/ -%{_datadir}/config*/* -%{_datadir}/icons/hicolor/*/*/* -%{tde_docdir}/HTML/en/kasablanca +%{tde_bindir}/kasablanca +%{tde_tdeappdir}/kasablanca.desktop +%{tde_datadir}/apps/kasablanca/ +%{tde_datadir}/config.kcfg/kbconfig.kcfg +%{tde_datadir}/icons/hicolor/*/apps/kasablanca.png +%{tde_tdedocdir}/HTML/en/kasablanca/ %changelog * Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1 diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec index 1a9790e46..a3c4e04c3 100644 --- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec @@ -1,10 +1,22 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif -%define tde_docdir %{_docdir}/kde +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-kdebluetooth @@ -27,20 +39,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: lockdev-devel -BuildRequires: xmms-devel -BuildRequires: bluez-libs-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdepim-devel +#BuildRequires: xmms-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdepim-devel BuildRequires: openobex-devel >= 1.1 BuildRequires: libusb-devel BuildRequires: pkgconfig Buildrequires: libidn-devel Buildrequires: dbus-tqt-devel -BuildRequires: obexftp-devel BuildRequires: automake >= 1.6.1 BuildRequires: autoconf >= 2.52 + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}bluez-devel +%else +BuildRequires: bluez-libs-devel +BuildRequires: obexftp-devel +%endif + Requires: %{name}-libs = %{version}-%{release} -Requires: %{_bindir}/kdesu +Requires: trinity-kdesu @@ -54,7 +72,6 @@ enabled devices as straightforward as possible. %package libs Summary: Base libraries for %{name} Group: System Environment/Libraries -Obsoletes: %{name} < %{version}-%{release} %if 0%{?fedora} >= 8 Provides: dbus-bluez-pin-helper @@ -86,9 +103,9 @@ KDE Bluetooth framework development libraries and headers. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -96,21 +113,31 @@ KDE Bluetooth framework development libraries and headers. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export CXXFLAGS="${CXXFLAGS} -I%{_includedir}/dbus-1.0" - unset QTDIR || : ; . /etc/profile.d/qt.sh -%configure \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-debug \ - --disable-dependency-tracking \ - --enable-final \ - --enable-closure \ - --with-extra-includes=%{_includedir}/tqt +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool +export KDEDIR=%{tde_prefix} + +# FIXME: dbus-tqt headers are not found without this ... +export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + --datadir=%{tde_datadir} \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-debug \ + --disable-dependency-tracking \ + --enable-final \ + --enable-closure \ + --with-extra-includes=%{tde_includedir}/tqt: + +%__make %{?_smp_mflags} LIBTOOL=$(which libtool) %install @@ -122,14 +149,13 @@ for DESK_PATH in applications/kde applnk/Utilities ; do desktop-file-install \ --mode=644 \ --vendor="" \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --dir=$RPM_BUILD_ROOT%{tde_datadir}/applications/kde \ --remove-category="Network" \ --add-category="System" \ --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/$DESK_PATH/*.desktop ||: + $RPM_BUILD_ROOT%{tde_datadir}/$DESK_PATH/*.desktop ||: done -touch %{name}.lang PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard kcm_btpaired kio_bluetooth kio_obex2 kio_sdp libkbluetooth kdebluetooth" @@ -139,8 +165,8 @@ done rm -f $RPM_BUILD_ROOT/%{_datadir}/applnk/Settings/Network/Bluetooth/.directory -rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.a -rm -f ${RPM_BUILD_ROOT}%{_libdir}/kde3/*.a +rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/*.a +rm -f ${RPM_BUILD_ROOT}%{tde_libdir}/kde3/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -158,48 +184,48 @@ touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||: -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL README -%{_bindir}/kblue* -%{_bindir}/kbtobexclient -%{_bindir}/kioobex_start -%{_bindir}/kinputwizard -%{_datadir}/applications/kde/*.desktop -%{_datadir}/applnk/.hidden/*.desktop -%{_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop -%{_datadir}/apps/*/* -%{_datadir}/autostart/* -%{_datadir}/desktop-directories/* -%{_datadir}/icons/hicolor/*/*/* -%{_datadir}/mimelnk/bluetooth/ -%{_datadir}/service*/* -%lang(ca) %{tde_docdir}/HTML/ca/kdebluetooth/ -%lang(da) %{tde_docdir}/HTML/da/kdebluetooth/ -%lang(en) %{tde_docdir}/HTML/en/kdebluetooth/ -%lang(es) %{tde_docdir}/HTML/es/kdebluetooth/ -%lang(et) %{tde_docdir}/HTML/et/kdebluetooth/ -%lang(fr) %{tde_docdir}/HTML/fr/kdebluetooth/ -%lang(it) %{tde_docdir}/HTML/it/kdebluetooth/ -%lang(nl) %{tde_docdir}/HTML/nl/kdebluetooth/ -%lang(pt) %{tde_docdir}/HTML/pt/kdebluetooth/ -%lang(ru) %{tde_docdir}/HTML/ru/kdebluetooth/ -%lang(sv) %{tde_docdir}/HTML/sv/kdebluetooth/ +%{tde_bindir}/kblue* +%{tde_bindir}/kbtobexclient +%{tde_bindir}/kioobex_start +%{tde_bindir}/kinputwizard +%{tde_tdeappdir}/*.desktop +%{tde_datadir}/applnk/.hidden/*.desktop +%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop +%{tde_datadir}/apps/*/* +%{tde_datadir}/autostart/* +%{tde_datadir}/desktop-directories/* +%{tde_datadir}/icons/hicolor/*/*/* +%{tde_datadir}/mimelnk/bluetooth/ +%{tde_datadir}/service*/* +%lang(ca) %{tde_tdedocdir}/HTML/ca/kdebluetooth/ +%lang(da) %{tde_tdedocdir}/HTML/da/kdebluetooth/ +%lang(en) %{tde_tdedocdir}/HTML/en/kdebluetooth/ +%lang(es) %{tde_tdedocdir}/HTML/es/kdebluetooth/ +%lang(et) %{tde_tdedocdir}/HTML/et/kdebluetooth/ +%lang(fr) %{tde_tdedocdir}/HTML/fr/kdebluetooth/ +%lang(it) %{tde_tdedocdir}/HTML/it/kdebluetooth/ +%lang(nl) %{tde_tdedocdir}/HTML/nl/kdebluetooth/ +%lang(pt) %{tde_tdedocdir}/HTML/pt/kdebluetooth/ +%lang(ru) %{tde_tdedocdir}/HTML/ru/kdebluetooth/ +%lang(sv) %{tde_tdedocdir}/HTML/sv/kdebluetooth/ %files libs %defattr(-,root,root,-) -%{_libdir}/*.la -%{_libdir}/*.so.* -%{_libdir}/kde3/*.so -%{_libdir}/kde3/*.la -%{_libdir}/kdebluetooth/ +%{tde_libdir}/*.la +%{tde_libdir}/*.so.* +%{tde_tdelibdir}/*.so +%{tde_tdelibdir}/*.la +%{tde_libdir}/kdebluetooth/ %files devel %defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/*.so +%{tde_includedir}/* +%{tde_libdir}/*.so %changelog diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index faf09237e..53fdbdf15 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -6,7 +6,7 @@ Name: trinity-desktop Version: 3.5.13 -Release: 5%{?dist}%{?_variant} +Release: 6%{?dist}%{?_variant} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -76,12 +76,141 @@ Requires: trinity-tdewebdev >= %{version} ########## +%package applications +Group: User Interface/Desktops +Summary: Meta-package to install all TDE applications + +Requires: trinity-abakus +Requires: trinity-amarok +Requires: trinity-basket +Requires: trinity-bibletime +#Requires: trinity-compizconfig-backend-kconfig +#Requires: trinity-desktop-effects-kde +Requires: trinity-digikam +Requires: trinity-dolphin +Requires: trinity-filelight +#Requires: trinity-filelight-l10n +# Fusion-icon requires 'trinity-compizconfig-backend-kconfig' +#Requires: trinity-fusion-icon +Requires: trinity-gwenview +Requires: trinity-k3b +# Warning, k9copy requires ffmpeg +Requires: trinity-k9copy +Requires: trinity-kaffeine +Requires: trinity-kaffeine-mozilla +Requires: trinity-katapult +Requires: trinity-kbarcode +Requires: trinity-kbfx +Requires: trinity-kbookreader +Requires: trinity-kchmviewer +Requires: trinity-kcmautostart +Requires: trinity-kcpuload +Requires: trinity-kdbusnotification +Requires: trinity-guidance +Requires: trinity-style-lipstik +Requires: trinity-style-qtcurve +Requires: trinity-systemsettings +Requires: trinity-kdesudo +Requires: trinity-kdesvn +Requires: trinity-kdiff3 +Requires: trinity-kdirstat +Requires: trinity-kdmtheme +Requires: trinity-keep +Requires: trinity-kerry +Requires: trinity-kgtk-qt3 +Requires: trinity-kile +Requires: trinity-kima +Requires: trinity-kio-locate +Requires: trinity-kio-umountwrapper +Requires: trinity-kiosktool +Requires: trinity-kmplayer +Requires: trinity-kmyfirewall +Requires: trinity-kmymoney +Requires: trinity-knemo +Requires: trinity-knetload +Requires: trinity-knetstats +Requires: trinity-knetworkmanager +Requires: trinity-knights +Requires: trinity-knowit +Requires: trinity-knutclient +Requires: trinity-koffice-suite +#Requires: trinity-konstruct +Requires: trinity-konversation +Requires: trinity-kopete-otr +Requires: trinity-kpicosim +Requires: trinity-kpilot +# Warning, kradio requires libmp3lame +Requires: trinity-kradio +Requires: trinity-krename +Requires: trinity-krusader +Requires: trinity-ksplash-engine-moodin +Requires: trinity-ksquirrel +Requires: trinity-kstreamripper +Requires: trinity-ksystemlog +Requires: trinity-ktechlab +Requires: trinity-ktorrent +Requires: trinity-kuickshow +Requires: trinity-kvirc +Requires: trinity-kvkbd +#Requires: trinity-kvpnc # R14 only +Requires: trinity-kwin-style-crystal +Requires: trinity-piklab +Requires: trinity-potracegui +#Requires: trinity-qt4-tqt-theme-engine +Requires: trinity-smartcardauth +Requires: trinity-smb4k +Requires: trinity-soundkonverter +Requires: trinity-tellico +Requires: trinity-wlassistant +Requires: trinity-yakuake + +# On RHEL 5, HAL version is too old for kpowersave . +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} +Requires: trinity-kpowersave +%endif + +# On RHEL 5, GTK2 version is too old for gtk-qt-engine. +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} +Requires: trinity-gtk-qt-engine +%endif + +# On RHEL 5, lilypond is not available, so no rosegarden :'-( +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} +Requires: trinity-rosegarden +%endif + +%description applications +%{summary} + +%files applications + +########## + +%package extras +Group: User Interface/Desktops +Summary: Meta-package to install all extras (unofficial) TDE packages + +Requires: trinity-akode +Requires: trinity-kasablanca +Requires: trinity-kdebluetooth +Requires: trinity-ksensors +Requires: trinity-style-ia-oa + +%description extras +%{summary} + +%files extras + +########## + %package all Group: User Interface/Desktops Summary: Meta-package to install all TDE packages Requires: %{name} = %{version} +Requires: %{name}-applications = %{version} Requires: %{name}-devel = %{version} +#Requires: %{name}-extras = %{version} %description all %{summary} @@ -133,6 +262,9 @@ Summary: Yum configuration files for Trinity %endif %changelog +* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 +- Add 'applications' subpackage + * Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 - Updates to reflect new packages names - Add Mageia 2 support |