diff options
Diffstat (limited to 'redhat/tdemultimedia')
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch | 250 | ||||
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec | 115 |
2 files changed, 299 insertions, 66 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch new file mode 100644 index 000000000..c8a4e4d96 --- /dev/null +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch @@ -0,0 +1,250 @@ +diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory +--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory 2013-07-28 16:37:31.827222470 +0200 ++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100 +@@ -1,89 +0,0 @@ +-[Desktop Entry] +-Encoding=UTF-8 +-Name=Music +-Name[br]=Sonerezh +-Name[bs]=Muzika +-Name[ca]=Música +-Name[da]=Musik +-Name[el]=Μουσική +-Name[eo]=Muziko +-Name[es]=Musica +-Name[et]=Muusika +-Name[eu]=Musika +-Name[fa]=موسیقی +-Name[fi]=Musiikki +-Name[fr]=Musique +-Name[ga]=Ceol +-Name[gl]=Música +-Name[he]=מוזיקה +-Name[hu]=Zene +-Name[is]=Tónlist +-Name[it]=Musica +-Name[ja]=音楽 +-Name[km]=តន្ត្រី +-Name[lt]=Muzika +-Name[nb]=Musikk +-Name[ne]=सङ्गित +-Name[nl]=Muziek +-Name[nn]=Musikk +-Name[pa]=ਸੰਗੀਤ +-Name[pl]=Muzyka +-Name[pt]=Música +-Name[pt_BR]=Música +-Name[sk]=Hudba +-Name[sl]=Glasba +-Name[sr]=Музика +-Name[sr@Latn]=Muzika +-Name[sv]=Musik +-Name[tr]=Müzik +-Name[uk]=Музика +-Name[zh_CN]=音乐 +-Name[zh_HK]=音樂 +-GenericName=Professional Audio +-GenericName[bg]=Професионално аудио +-GenericName[bs]=Profesionalni audio +-GenericName[ca]=Àudio professional +-GenericName[cs]=Profesionální zvuk +-GenericName[da]=Professionel lyd +-GenericName[el]=Επαγγελματικός ήχος +-GenericName[es]=Audio profesional +-GenericName[et]=Professionaalne audio +-GenericName[eu]=Audio profesionala +-GenericName[fa]=صوتی حرفهای +-GenericName[fi]=Ammattilaisääni +-GenericName[fr]=Audio professionnel +-GenericName[ga]=Fuaim Phroifisiúnta +-GenericName[gl]=Son Profesional +-GenericName[he]=שמע מקצועי +-GenericName[hu]=Professzinonális minőségű hanganyag +-GenericName[is]=Atvinnumannahljóð +-GenericName[it]=Audio professionale +-GenericName[ja]=プロフェッショナルオーディオ +-GenericName[kk]=Кәсіпқой Аудио +-GenericName[km]=អូឌីយ៉ូឯកទេស +-GenericName[ko]=전문가 오디오 +-GenericName[lt]=Profesionalus audio +-GenericName[mk]=Професионално аудио +-GenericName[nb]=Profesjonell lyd +-GenericName[nds]=Profeschonell Klang +-GenericName[ne]=पेशागत अडियो +-GenericName[nl]=Professionele audio +-GenericName[nn]=Profesjonell lydhandsaming +-GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ +-GenericName[pl]=Profesjonalne audio +-GenericName[pt]=Áudio Profissional +-GenericName[pt_BR]=Áudio Profissional +-GenericName[ru]=Профессиональное аудио +-GenericName[sk]=Profesionálne audio +-GenericName[sl]=Profesionalni zvok +-GenericName[sr]=Професионални звук +-GenericName[sr@Latn]=Profesionalni zvuk +-GenericName[sv]=Professionellt ljud +-GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ +-GenericName[tr]=Profesyonel Ses +-GenericName[uk]=Професійне аудіо +-GenericName[zh_CN]=专业音频 +-GenericName[zh_HK]=專業音效 +-GenericName[zh_TW]=專業音效 +-Icon=package +- +diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu +--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu 2013-07-28 16:37:31.827222470 +0200 ++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100 +@@ -1,21 +0,0 @@ +- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" +- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> +- +-<Menu> +-<Name>Applications</Name> +-<Menu> +- <Name>Multimedia</Name> +- <Exclude> +- <Category>Music</Category> +- </Exclude> +- <Menu> +- <Name>Jack and More</Name> +- <Directory>kde-multimedia-music.directory</Directory> +- <Include> +- <And> +- <Category>Music</Category> +- </And> +- </Include> +- </Menu> +-</Menu> +-</Menu> +diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am +--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am 2013-07-28 16:37:31.827222470 +0200 ++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am 2013-07-28 16:38:07.202464444 +0200 +@@ -22,8 +22,8 @@ + + EXTRA_DIST = $(kappfinder_multimedia_data_DATA) + +-xdg_directory_DATA = kde-multimedia-music.directory ++xdg_directory_DATA = tde-multimedia-music.directory + +-xdg_mergedmenu_DATA = kde-multimedia-music.menu ++xdg_mergedmenu_DATA = tde-multimedia-music.menu + xdg_mergedmenudir = $(xdg_menudir)/applications-merged + +diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory +--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100 ++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory 2013-06-07 19:26:15.000000000 +0200 +@@ -0,0 +1,89 @@ ++[Desktop Entry] ++Encoding=UTF-8 ++Name=Music ++Name[br]=Sonerezh ++Name[bs]=Muzika ++Name[ca]=Música ++Name[da]=Musik ++Name[el]=Μουσική ++Name[eo]=Muziko ++Name[es]=Musica ++Name[et]=Muusika ++Name[eu]=Musika ++Name[fa]=موسیقی ++Name[fi]=Musiikki ++Name[fr]=Musique ++Name[ga]=Ceol ++Name[gl]=Música ++Name[he]=מוזיקה ++Name[hu]=Zene ++Name[is]=Tónlist ++Name[it]=Musica ++Name[ja]=音楽 ++Name[km]=តន្ត្រី ++Name[lt]=Muzika ++Name[nb]=Musikk ++Name[ne]=सङ्गित ++Name[nl]=Muziek ++Name[nn]=Musikk ++Name[pa]=ਸੰਗੀਤ ++Name[pl]=Muzyka ++Name[pt]=Música ++Name[pt_BR]=Música ++Name[sk]=Hudba ++Name[sl]=Glasba ++Name[sr]=Музика ++Name[sr@Latn]=Muzika ++Name[sv]=Musik ++Name[tr]=Müzik ++Name[uk]=Музика ++Name[zh_CN]=音乐 ++Name[zh_HK]=音樂 ++GenericName=Professional Audio ++GenericName[bg]=Професионално аудио ++GenericName[bs]=Profesionalni audio ++GenericName[ca]=Àudio professional ++GenericName[cs]=Profesionální zvuk ++GenericName[da]=Professionel lyd ++GenericName[el]=Επαγγελματικός ήχος ++GenericName[es]=Audio profesional ++GenericName[et]=Professionaalne audio ++GenericName[eu]=Audio profesionala ++GenericName[fa]=صوتی حرفهای ++GenericName[fi]=Ammattilaisääni ++GenericName[fr]=Audio professionnel ++GenericName[ga]=Fuaim Phroifisiúnta ++GenericName[gl]=Son Profesional ++GenericName[he]=שמע מקצועי ++GenericName[hu]=Professzinonális minőségű hanganyag ++GenericName[is]=Atvinnumannahljóð ++GenericName[it]=Audio professionale ++GenericName[ja]=プロフェッショナルオーディオ ++GenericName[kk]=Кәсіпқой Аудио ++GenericName[km]=អូឌីយ៉ូឯកទេស ++GenericName[ko]=전문가 오디오 ++GenericName[lt]=Profesionalus audio ++GenericName[mk]=Професионално аудио ++GenericName[nb]=Profesjonell lyd ++GenericName[nds]=Profeschonell Klang ++GenericName[ne]=पेशागत अडियो ++GenericName[nl]=Professionele audio ++GenericName[nn]=Profesjonell lydhandsaming ++GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ ++GenericName[pl]=Profesjonalne audio ++GenericName[pt]=Áudio Profissional ++GenericName[pt_BR]=Áudio Profissional ++GenericName[ru]=Профессиональное аудио ++GenericName[sk]=Profesionálne audio ++GenericName[sl]=Profesionalni zvok ++GenericName[sr]=Професионални звук ++GenericName[sr@Latn]=Profesionalni zvuk ++GenericName[sv]=Professionellt ljud ++GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ ++GenericName[tr]=Profesyonel Ses ++GenericName[uk]=Професійне аудіо ++GenericName[zh_CN]=专业音频 ++GenericName[zh_HK]=專業音效 ++GenericName[zh_TW]=專業音效 ++Icon=package ++ +diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu +--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100 ++++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu 2013-07-28 16:38:14.396310283 +0200 +@@ -0,0 +1,21 @@ ++ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" ++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> ++ ++<Menu> ++<Name>Applications</Name> ++<Menu> ++ <Name>Multimedia</Name> ++ <Exclude> ++ <Category>Music</Category> ++ </Exclude> ++ <Menu> ++ <Name>Jack and More</Name> ++ <Directory>tde-multimedia-music.directory</Directory> ++ <Include> ++ <And> ++ <Category>Music</Category> ++ </And> ++ </Include> ++ </Menu> ++</Menu> ++</Menu> diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec index 1e4b2a989..17bd92fc2 100644 --- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 3.5.13.2 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -25,8 +27,8 @@ Name: trinity-tdemultimedia Summary: Multimedia applications for the Trinity Desktop Environment (TDE) -Version: 3.5.13.2 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Version: %{tde_version} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} License: GPLv2 Group: Applications/Multimedia @@ -39,8 +41,8 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - Patch0: tdemultimedia-3.5.13.2-ftbfs.patch +Patch1: tdemultimedia-3.5.13.2-fix_xdg_menu.patch Obsoletes: trinity-kdemultimedia < %{version}-%{release} Provides: trinity-kdemultimedia = %{version}-%{release} @@ -53,17 +55,15 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} BuildRequires: autoconf automake libtool m4 -BuildRequires: qt3-devel -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: qt3-devel >= 3.3.8.d +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} %if "%{?_with_akode}" != "" BuildRequires: trinity-akode-devel -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} BuildRequires: trinity-akode-libmad %endif -%endif BuildRequires: desktop-file-utils BuildRequires: zlib-devel @@ -567,8 +567,8 @@ This package provides data on multimedia applications for kappfinder. %files kappfinder-data %defattr(-,root,root,-) %{tde_datadir}/apps/kappfinder/* -%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory -%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu +%{tde_datadir}/desktop-directories/tde-multimedia-music.directory +%{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu ########## @@ -671,8 +671,8 @@ This package includes TDE's dockable sound mixer applet. %{tde_tdelibdir}/kmix_panelapplet.so %{tde_tdelibdir}/kmixctrl.la %{tde_tdelibdir}/kmixctrl.so -%{tde_libdir}/lib[kt]deinit_kmix.so -%{tde_libdir}/lib[kt]deinit_kmixctrl.so +%{tde_libdir}/libkdeinit_kmix.so +%{tde_libdir}/libkdeinit_kmixctrl.so %{tde_tdeappdir}/kmix.desktop %{tde_datadir}/apps/kicker/applets/kmixapplet.desktop %{tde_datadir}/apps/kmix/ @@ -725,7 +725,7 @@ This is a sound recording utility for Trinity. %{tde_tdelibdir}/libkrecexport_ogg.so %{tde_tdelibdir}/libkrecexport_wave.la %{tde_tdelibdir}/libkrecexport_wave.so -%{tde_libdir}/lib[kt]deinit_krec.so +%{tde_libdir}/libkdeinit_krec.so %{tde_tdeappdir}/krec.desktop %{tde_datadir}/apps/krec/ %{tde_datadir}/icons/hicolor/*/apps/krec.png @@ -1020,7 +1020,7 @@ formats supported by your installation of aRts (including aRts plugins). %{tde_tdelibdir}/noatunsimple.so %{tde_libdir}/libartseffects.la %{tde_libdir}/libartseffects.so -%{tde_libdir}/lib[kt]deinit_noatun.so +%{tde_libdir}/libkdeinit_noatun.so %{tde_libdir}/libnoatun.so.* %{tde_libdir}/libnoatunarts.la %{tde_libdir}/libnoatunarts.so @@ -1105,10 +1105,10 @@ noatun plugins. %{tde_libdir}/libaudiocdplugins.so %{tde_libdir}/libkcddb.la %{tde_libdir}/libkcddb.so -%{tde_libdir}/lib[kt]deinit_kmix.la -%{tde_libdir}/lib[kt]deinit_kmixctrl.la -%{tde_libdir}/lib[kt]deinit_krec.la -%{tde_libdir}/lib[kt]deinit_noatun.la +%{tde_libdir}/libkdeinit_kmix.la +%{tde_libdir}/libkdeinit_kmixctrl.la +%{tde_libdir}/libkdeinit_krec.la +%{tde_libdir}/libkdeinit_noatun.la %{tde_libdir}/libkmidlib.la %{tde_libdir}/libkmidlib.so %{tde_libdir}/libmpeg.la @@ -1139,8 +1139,8 @@ noatun plugins. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - %patch0 -p1 -b .ftbfs +%patch1 -p1 -b .xdgmenu # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -1168,31 +1168,33 @@ if [ -d "/usr/X11R6" ]; then fi %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --datadir=%{tde_datadir} \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --with-cdparanoia \ - --with-flac \ - --with-theora \ - --with-vorbis \ - --with-alsa \ - --with-gstreamer \ - --with-lame \ - --disable-debug \ - --disable-warnings \ - --enable-final \ - --disable-rpath \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_tdeincludedir} \ + --datadir=%{tde_datadir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --disable-rpath \ + \ + --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ + \ + --with-cdparanoia \ + --with-flac \ + --with-theora \ + --with-vorbis \ + --with-alsa \ + --with-gstreamer \ + --with-lame \ %{?_with_akode} %{!?_with_akode:--without-akode} \ %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ - %{?with_xine:--with-xine} %{!?with_xine:--without-xine} \ - --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ - --enable-closure + %{?with_xine:--with-xine} %{!?with_xine:--without-xine} %__make %{?_smp_mflags} @@ -1205,35 +1207,16 @@ export PATH="%{tde_bindir}:${PATH}" # don't make these world-writeable chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/* -# locale's -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common - done - popd - fi -done -fi - -# Moves the XDG configuration files to TDE directory -%__install -p -D -m644 \ - "%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \ - "%{?buildroot}%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu" -%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" - %clean %__rm -rf %{buildroot} %changelog +* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3 +- Rebuild with NDEBUG option +- Fix XDG menu + * Mon Jun 17 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2 - Enable "LAME" support |