diff options
author | François Andriot <albator78@libertysurf.fr> | 2015-06-27 20:43:06 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2015-06-27 20:43:06 +0200 |
commit | d3c1f8ab667376639b6ff83e4eff50cd861fe5d2 (patch) | |
tree | 53641a8039795b80656cbc7afaf4c3ff2ba5af28 | |
parent | 97e1a5b5fcaa7afe458b5fc12476a458135f7dd7 (diff) | |
download | tde-packaging-d3c1f8ab667376639b6ff83e4eff50cd861fe5d2.tar.gz tde-packaging-d3c1f8ab667376639b6ff83e4eff50cd861fe5d2.zip |
RPM packaging: update dependencies packages
16 files changed, 117 insertions, 73 deletions
diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec index 388005a48..6c6ba8936 100644 --- a/redhat/extras/akode/akode-14.0.0.spec +++ b/redhat/dependencies/akode/akode-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package akode (version R14.0.0) +# spec file for package akode (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -86,6 +88,7 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: libsamplerate-devel %endif +%if 0 # PULSEAUDIO support %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define _with_pulseaudio --with-pulseaudio @@ -99,6 +102,7 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: pulseaudio-devel %endif %endif +%endif # MAD support %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} @@ -111,8 +115,8 @@ BuildRequires: libmad-devel %endif %endif - -BuildRequires: automake libtool +BuildRequires: cmake >= 2.8 +BuildRequires: libtool BuildRequires: alsa-lib-devel BuildRequires: libvorbis-devel BuildRequires: speex-devel @@ -135,16 +139,16 @@ aKode also has the following audio outputs: %files %defattr(-,root,root,-) %doc rpmdocs/* -%{tde_bindir}/akodeplay -%{tde_libdir}/libakode.so.* -%{tde_libdir}/libakode_alsa_sink.la -%{tde_libdir}/libakode_alsa_sink.so -%{tde_libdir}/libakode_mpc_decoder.la -%{tde_libdir}/libakode_mpc_decoder.so -%{tde_libdir}/libakode_oss_sink.la -%{tde_libdir}/libakode_oss_sink.so -%{tde_libdir}/libakode_xiph_decoder.la -%{tde_libdir}/libakode_xiph_decoder.so +%{_bindir}/akodeplay +%{_libdir}/libakode.so.* +%{_libdir}/libakode_alsa_sink.la +%{_libdir}/libakode_alsa_sink.so +%{_libdir}/libakode_mpc_decoder.la +%{_libdir}/libakode_mpc_decoder.so +%{_libdir}/libakode_oss_sink.la +%{_libdir}/libakode_oss_sink.so +%{_libdir}/libakode_xiph_decoder.la +%{_libdir}/libakode_xiph_decoder.so %post /sbin/ldconfig @@ -169,11 +173,11 @@ This package contains the development files for Akode. %files devel %defattr(-,root,root,-) -%{tde_bindir}/akode-config -%{tde_includedir}/* -%{tde_libdir}/libakode.la -%{tde_libdir}/libakode.so -%{tde_libdir}/pkgconfig/*.pc +%{_bindir}/akode-config +%{_includedir}/* +%{_libdir}/libakode.la +%{_libdir}/libakode.so +#%{_libdir}/pkgconfig/*.pc %post devel /sbin/ldconfig @@ -195,8 +199,8 @@ This package contains the Jack audio output backend for Akode. %files jack %defattr(-,root,root,-) -%{tde_libdir}/libakode_jack_sink.la -%{tde_libdir}/libakode_jack_sink.so +%{_libdir}/libakode_jack_sink.la +%{_libdir}/libakode_jack_sink.so %post jack /sbin/ldconfig @@ -221,8 +225,8 @@ Recommended for network transparent audio. %files pulseaudio %defattr(-,root,root,-) -%{tde_libdir}/libakode_polyp_sink.la -%{tde_libdir}/libakode_polyp_sink.so +%{_libdir}/libakode_polyp_sink.la +%{_libdir}/libakode_polyp_sink.so %post pulseaudio /sbin/ldconfig @@ -249,8 +253,8 @@ This package contains the samplerate decoder for Akode. # License: GPLv2+ %files libsamplerate %defattr(-,root,root,-) -%{tde_libdir}/libakode_src_resampler.la -%{tde_libdir}/libakode_src_resampler.so +%{_libdir}/libakode_src_resampler.la +%{_libdir}/libakode_src_resampler.so %post libsamplerate /sbin/ldconfig @@ -273,8 +277,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} This package contains the mad decoder for Akode. %files libmad -%{tde_libdir}/libakode_mpeg_decoder.la -%{tde_libdir}/libakode_mpeg_decoder.so +%{_libdir}/libakode_mpeg_decoder.la +%{_libdir}/libakode_mpeg_decoder.so %post libmad /sbin/ldconfig @@ -293,51 +297,60 @@ This package contains the mad decoder for Akode. ########## %prep -%setup -q -n akode-2.0.2 - -%__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" -%__make -f admin/Makefile.common +%setup -q -n akode %build -export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H" - -%configure \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_includedir} \ - --datadir=%{tde_datadir} \ +unset QTDIR QTINC QTLIB + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_LIBLTDL="OFF" \ + -DWITH_ALSA_SINK="ON" \ + %{!?_with_jack:-DWITH_JACK_SINK="OFF"} %{?_with_jack:-DWITH_JACK_SINK="ON"} \ + %{!?_with_pulseaudio:-DWITH_POLYP_SINK="OFF"} %{?_with_pulseaudio:-DWITH_POLYP_SINK="ON"} \ + -DWITH_OSS_SINK="ON" \ + -DWITH_SUN_SINK="OFF" \ \ - --without-libltdl \ - --with-alsa \ - --with-oss \ - %{?_with_flac} %{!?_with_flac:--without-flac} \ - %{?_with_jack} %{!?_with_jack:--without-jack} \ - %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ - %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ - --with-speex \ - --with-vorbis \ - --without-ffmpeg \ - %{?_with_libmad} %{!?_with_libmad:--without-libmad} + -DWITH_FFMPEG_DECODER="OFF" \ + -DWITH_MPC_DECODER="ON" \ + -DWITH_MPEG_DECODER="ON" \ + -DWITH_SRC_RESAMPLER="ON" \ + -DWITH_XIPH_DECODER="ON" \ + .. + +%__make %{?_smp_mflags} || %__make + -%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool +# %{?_with_flac} %{!?_with_flac:--without-flac} \ +# %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ +# --with-speex \ +# --with-vorbis \ +# --without-ffmpeg \ +# %{?_with_libmad} %{!?_with_libmad:--without-libmad} %install %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{?buildroot} -C build # unpackaged files -%__rm -f %{buildroot}%{tde_libdir}/*.a +#%__rm -f %{buildroot}%{tde_libdir}/*.a # rpmdocs for file in AUTHORS COPYING NEWS README TODO ; do diff --git a/redhat/extras/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec index 89b2546e3..89b2546e3 100644 --- a/redhat/extras/akode/akode-3.5.13.2.spec +++ b/redhat/dependencies/akode/akode-3.5.13.2.spec diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 901ff690e..29a1035a5 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package arts (version R14.0.0) +# spec file for package arts (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg arts %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec index 67773f94f..9b7d4c79f 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package avahi-tqt (version R14.0.0) +# spec file for package avahi-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libavahi %{_lib}avahi diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index 289528caa..cb952ce0b 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-1-tqt (version R14.0.0) +# spec file for package dbus-1-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index 3fe808a0e..05b00abd0 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package dbus-tqt (version R14.0.0) +# spec file for package dbus-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libdbus %{_lib}dbus diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index 316bd47bf..d57b43e99 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libart-lgpl (version R14.0.0) +# spec file for package libart-lgpl (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -18,7 +18,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libart %{_lib}art diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 648c5d03b..9a6a9a6ff 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcaldav (version R14.0.0) +# spec file for package libcaldav (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index e7c587bdc..7faa4cf44 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package libcarddav (version R14.0.0) +# spec file for package libcarddav (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec index 84d0c4878..cc787fdfd 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package python-tqt (version R14.0.0) +# spec file for package python-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -23,7 +23,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg python-tqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec index a4455535f..30edceff3 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package sip4-tqt (version R14.0.0) +# spec file for package sip4-tqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -27,7 +27,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index d6d84b253..7c3c8bcb4 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqca-tls (version R14.0.0) +# spec file for package tqca-tls (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec index 48fed65e9..23bee37b8 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqca (version R14.0.0) +# spec file for package tqca (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqca %define tde_prefix /opt/trinity %define tde_includedir %{tde_prefix}/include diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec index f1667965f..52e6316d5 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqscintilla (version R14.0.0) +# spec file for package tqscintilla (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqscintilla %define tde_prefix /opt/trinity %define tde_datadir %{tde_prefix}/share diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index a0a67381c..5ec09f5db 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqt3 (version R14.0.0) +# spec file for package tqt3 (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -16,7 +16,9 @@ # # TDE variables +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} %define libtqt3 %{_lib}tqt3 @@ -262,6 +264,9 @@ BuildRequires: unixODBC-devel # SQLITE support BuildRequires: sqlite-devel +# SQLITE3 support +BuildRequires: sqlite3-devel + # POSTGRESQL support BuildRequires: postgresql BuildRequires: postgresql-devel diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index d743834b9..7b8406a36 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tqtinterface (version R14.0.0) +# spec file for package tqtinterface (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -21,7 +21,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules |