From 193ac9dc51fbc8d12aa48fe1191c8512850cc4ff Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 9 Aug 2012 12:02:10 +0200 Subject: RHEL/Fedora: add support for MGA2/MDV2011 in many applications --- .../soundkonverter/trinity-soundkonverter.spec | 120 ++++++++++++--------- 1 file changed, 68 insertions(+), 52 deletions(-) (limited to 'redhat/applications/soundkonverter') diff --git a/redhat/applications/soundkonverter/trinity-soundkonverter.spec b/redhat/applications/soundkonverter/trinity-soundkonverter.spec index 28817fc21..5cfc41054 100644 --- a/redhat/applications/soundkonverter/trinity-soundkonverter.spec +++ b/redhat/applications/soundkonverter/trinity-soundkonverter.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp soundkonverter -%define version 0.3.8 -%define release 1 # 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 # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%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_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_tdedocdir} Name: trinity-%{kdecomp} Summary: audio converter frontend for Trinity -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.3.8 +Release: 1%{?dist}%{?_variant} License: GPLv2+ Group: Application/Multimedia @@ -28,14 +35,14 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://potracegui.sourceforge.net -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils @@ -71,14 +78,13 @@ See the 'soundkonverter-trinity' package for more information. %prep -unset QTDIR; . /etc/profile.d/qt.sh %setup -q -n applications/%{kdecomp} # 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" + -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" @@ -86,19 +92,27 @@ unset QTDIR; . /etc/profile.d/qt.sh %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt:/usr/include/cdda \ - --enable-closure + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_includedir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt:/usr/include/cdda \ + --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -109,46 +123,48 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} > /dev/null +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} > /dev/null +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_bindir}/soundkonverter -%{_bindir}/userscript.sh -%{_datadir}/applications/kde/soundkonverter.desktop -%{_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop -%{_datadir}/apps/soundkonverter -%exclude %{_datadir}/apps/soundkonverter/amarokscript/README -%exclude %{_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb -%{tde_docdir}/HTML/en/soundkonverter/common -%{tde_docdir}/HTML/en/soundkonverter/index.cache.bz2 -%{tde_docdir}/HTML/en/soundkonverter/index.docbook -%{_datadir}/icons/hicolor/*/apps/soundkonverter*.png -%{_datadir}/mimelnk/application/x-la.soundkonverter.desktop -%{_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop -%{_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop -%{_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop -%{_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop -%{_datadir}/mimelnk/audio/amr.soundkonverter.desktop -%{_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop -%{_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop -%{_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop -%{_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop -%{_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop -%{_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop -%{_datadir}/mimelnk/video/x-flv.soundkonverter.desktop +%{tde_bindir}/soundkonverter +%{tde_bindir}/userscript.sh +%{tde_tdeappdir}/soundkonverter.desktop +%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop +%{tde_datadir}/apps/soundkonverter +%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README +%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb +%{tde_tdedocdir}/HTML/en/soundkonverter/common +%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2 +%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook +%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png +%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop +%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop +%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop +%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop +%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop +%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop +%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop %files amarok %defattr(-,root,root,-) -%{_datadir}/apps/soundkonverter/amarokscript/README -%{_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb +%{tde_datadir}/apps/soundkonverter/amarokscript/README +%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb %Changelog -- cgit v1.2.3