From 45ecf4df10293c33350a90f4638864a025dea883 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 15 Sep 2014 13:59:26 +0200 Subject: [PATCH] Clean spec file for Yocto compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also remove generated configure file. Change-Id: I4482871449b6795bbcc17c04a8b4b282475fa920 Signed-off-by: Kévin THIERRY Signed-off-by: Ronan Le Martret --- packaging/libmm-sound.spec | 71 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec index 6c0c21a..6f58c70 100644 --- a/packaging/libmm-sound.spec +++ b/packaging/libmm-sound.spec @@ -10,20 +10,20 @@ License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1: sound-server.service Source2: sound-server.path -Source1001: libmm-sound.manifest -Requires(post): /sbin/ldconfig -Requires(post): /usr/bin/vconftool -Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig(mm-common) -BuildRequires: pkgconfig(avsystem) -BuildRequires: pkgconfig(mm-log) -BuildRequires: pkgconfig(mm-session) -BuildRequires: pkgconfig(audio-session-mgr) -BuildRequires: pkgconfig(sysman) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(vconf) -BuildRequires: pkgconfig(heynoti) -BuildRequires: pkgconfig(security-server) +Source1001: libmm-sound.manifest +Requires(post): /sbin/ldconfig +Requires(post): /usr/bin/vconftool +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(mm-common) +BuildRequires: pkgconfig(avsystem) +BuildRequires: pkgconfig(mm-log) +BuildRequires: pkgconfig(mm-session) +BuildRequires: pkgconfig(audio-session-mgr) +BuildRequires: pkgconfig(sysman) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(heynoti) +BuildRequires: pkgconfig(security-server) %description MMSound Package contains client lib and sound_server binary for sound system @@ -31,7 +31,7 @@ MMSound Package contains client lib and sound_server binary for sound system %package devel Summary: MMSound development package -Group: Development/Libraries +Group: System/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -39,7 +39,7 @@ MMSound development package for sound system %package sdk-devel Summary: MMSound development package -Group: Development/Libraries +Group: System/Libraries Requires: %{name}-devel = %{version}-%{release} %description sdk-devel @@ -47,14 +47,13 @@ MMSound development package for sound system %package tool Summary: MMSound utility package - contians mm_sound_testsuite, sound_check -Group: TO_BE/FILLED_IN +Group: System/Utilities Requires: %{name} = %{version}-%{release} %description tool MMSound utility package - contians mm_sound_testsuite, sound_check for sound system - %prep %setup -q cp %{SOURCE1001} . @@ -75,26 +74,27 @@ CFLAGS="%{optflags} -fvisibility=hidden -DMM_DEBUG_FLAG -DSEPARATE_SPEAKER_AND_W CFLAGS="$CFLAGS -DMURPHY"; export CFLAGS %endif %if %{with pulseaudio_samsung_policy} -%configure --prefix=/usr --enable-pulse --enable-security --enable-policy +%reconfigure --prefix=/usr --enable-pulse --enable-security --enable-policy %else -%configure --prefix=/usr --enable-pulse --enable-security +%reconfigure --prefix=/usr --enable-pulse --enable-security %endif -make %{?_smp_mflags} +%__make %{?_smp_mflags} + %install %make_install -install -d %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -install -m0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/ -install -m0644 %{SOURCE2} %{buildroot}/usr/lib/systemd/system/ -ln -sf ../sound-server.path %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/sound-server.path +install -d %{buildroot}%{_unitdir}/multi-user.target.wants +install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/ +install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/ + +%install_service multi-user.target.wants sound-server.path # FIXME: remove after systemd is in mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d -ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S23soundserver -ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S23soundserver - +ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S23soundserver +ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S23soundserver %post @@ -128,13 +128,13 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4 %{_libdir}/soundplugins/libsoundplugintone.so %{_libdir}/soundplugins/libsoundpluginwave.so %{_libdir}/soundplugins/libsoundpluginkeytone.so -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/soundserver -%{_sysconfdir}/rc.d/rc3.d/S23soundserver -%{_sysconfdir}/rc.d/rc4.d/S23soundserver -/usr/share/sounds/sound-server/* -/usr/lib/systemd/system/multi-user.target.wants/sound-server.path -/usr/lib/systemd/system/sound-server.service -/usr/lib/systemd/system/sound-server.path +%config %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/soundserver +%config %{_sysconfdir}/rc.d/rc3.d/S23soundserver +%config %{_sysconfdir}/rc.d/rc4.d/S23soundserver +%{_prefix}/share/sounds/sound-server/* +%{_unitdir}/multi-user.target.wants/sound-server.path +%{_unitdir}/sound-server.service +%{_unitdir}/sound-server.path %files devel %manifest %{name}.manifest @@ -146,7 +146,6 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4 %{_includedir}/mmf/mm_sound_plugin.h %{_includedir}/mmf/mm_sound_plugin_hal.h - %files sdk-devel %manifest %{name}.manifest %defattr(-,root,root,-) -- 2.7.4