From ff44fb9b735bb88100ffa65b2b6b0f8788f2c1bb Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 10 Jul 2014 10:12:47 +0200 Subject: [PATCH] Update init spec file. Change-Id: I2bf25916bf717d185b1a2043c26a3b66a86a63c9 --- .../specfile-initial/ail/packaging/ail.spec | 17 ++++---- .../packaging/audio-session-manager.spec | 20 ++------- .../avsystem/packaging/avsystem.spec | 33 ++++++--------- .../specfile-initial/dlog/packaging/dlog.spec | 14 +++---- .../libmm-session/packaging/libmm-session.spec | 16 +++----- .../libmm-ta/packaging/libmm-ta.spec | 36 ++++------------ .../libnet-client/packaging/libnet-client.spec | 17 ++++---- .../media-server/packaging/media-server.spec | 37 ++++++++--------- .../packaging/user-session-units.spec | 48 ++++++++++------------ 9 files changed, 91 insertions(+), 147 deletions(-) diff --git a/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec b/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec index 3029141..5da089d 100755 --- a/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec +++ b/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec @@ -1,6 +1,6 @@ Name: ail Version: 0.2.80 -Release: 1 +Release: 0 License: Apache-2.0 Summary: Application Information Library Group: Application Framework/Libraries @@ -17,15 +17,15 @@ BuildRequires: pkgconfig(libtzplatform-config) Provides: libail = %{version}-%{release} %description -Application Information Library +Application Information Library package %package devel Summary: Application Information Library Development files Requires: libail = %{version}-%{release} -Requires: pkgconfig(libtzplatform-config) +Requires: pkgconfig(libtzplatform-config) %description devel -Application Information Library (devel) +Application Information Library Development files package %prep %setup -q @@ -41,9 +41,9 @@ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" %endif %cmake . -DBUILD_PKGTYPE=rpm \ - -DSMACK=Off + -DSMACK=Off -make %{?_smp_mflags} +%__make %{?_smp_mflags} %install %make_install @@ -80,7 +80,7 @@ update_DAC_for_db_file() echo "Failed to change the perms of $@" fi } -ail_initdb +ail_initdb 2>/dev/null mkdir -p %{TZ_SYS_RO_DESKTOP_APP} mkdir -p %{TZ_SYS_RW_DESKTOP_APP} mkdir -p %{TZ_SYS_DB} @@ -92,10 +92,9 @@ chsmack -a 'User' %{TZ_SYS_DB}/.app_info.db* %postun /sbin/ldconfig if [ $1 == 0 ]; then -rm -f %{TZ_SYS_DB}/.app_info.db* + rm -f %{TZ_SYS_DB}/.app_info.db* fi - %files %manifest %{name}.manifest %license LICENSE diff --git a/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec b/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec index 5f974db..75d305d 100644 --- a/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec +++ b/proto-meta-Tizen_generic/specfile-initial/audio-session-manager/packaging/audio-session-manager.spec @@ -5,7 +5,7 @@ Release: 0 Group: Multimedia/Service License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: audio-session-manager.manifest +Source1001: audio-session-manager.manifest Requires(post): /sbin/ldconfig Requires(post): /usr/bin/vconftool Requires(postun): /sbin/ldconfig @@ -16,11 +16,9 @@ BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(avsysaudio) BuildRequires: pkgconfig(security-server) - %description Audio Session Manager. - %package devel Summary: Audio Session Manager package (devel) Group: Multimedia/Development @@ -36,28 +34,21 @@ Requires: %{name}-devel = %{version}-%{release} %description sdk-devel %devel_desc - SDK Release. - - %prep -%setup -q +%setup -q cp %{SOURCE1001} . - %build - -%autogen --disable-static --noconfigure CFLAGS="%{optflags} -fvisibility=hidden -DMM_DEBUG_FLAG -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\"" ; export CFLAGS -%configure --disable-static --enable-security +%reconfigure --disable-static --enable-security make %{?jobs:-j%jobs} %install %make_install - -%post +%post /sbin/ldconfig vconftool set -t int memory/Sound/SoundStatus "0" -g 29 -f -i @@ -78,7 +69,6 @@ vconftool set -t int memory/Sound/SoundStatus "0" -g 29 -f -i %{_includedir}/mmf/audio-session-manager-types.h %{_includedir}/mmf/audio-session-manager.h - %files sdk-devel %manifest %{name}.manifest %defattr(-,root,root,-) @@ -86,5 +76,3 @@ vconftool set -t int memory/Sound/SoundStatus "0" -g 29 -f -i %{_includedir}/mmf/audio-session-manager.h %{_libdir}/libaudio-session-mgr.so %{_libdir}/pkgconfig/audio-session-mgr.pc - - diff --git a/proto-meta-Tizen_generic/specfile-initial/avsystem/packaging/avsystem.spec b/proto-meta-Tizen_generic/specfile-initial/avsystem/packaging/avsystem.spec index d1d2c95..e39c36b 100644 --- a/proto-meta-Tizen_generic/specfile-initial/avsystem/packaging/avsystem.spec +++ b/proto-meta-Tizen_generic/specfile-initial/avsystem/packaging/avsystem.spec @@ -6,7 +6,7 @@ Group: System/Libraries License: Apache-2.0 Source0: avsystem-%{version}.tar.gz Source101: packaging/avsystem.service -Source1001: avsystem.manifest +Source1001: avsystem.manifest Requires(post): /sbin/ldconfig Requires(post): /usr/bin/systemctl @@ -22,10 +22,8 @@ BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libascenario) - %description -Audio Video System - +Audio Video System package. %package devel Summary: Audio Video System Development headers and libraries @@ -33,30 +31,25 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Audio Video System Development headers and libraries. - +Audio Video System Development headers and libraries package. %package -n libavsysaudio Summary: Audio Video System libraries %description -n libavsysaudio -Audio Video System libraries +Audio Video System libraries package. %prep %setup -q -n %{name}-%{version} cp %{SOURCE1001} . - %build -%autogen -%configure \ +%reconfigure \ %if 0%{?simulator} - --enable-audiotest --enable-sdk -%else - --enable-audiotest + --enable-sdk %endif - -make %{?jobs:-j%jobs} + --enable-audiotest +%__make %{?jobs:-j%jobs} %install %make_install @@ -66,9 +59,9 @@ ln -s ../init.d/snd_init %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S15snd_init mkdir -m 755 -p %{buildroot}/%{_sysconfdir}/rc.d/rc4.d/ ln -s ../init.d/snd_init %{buildroot}/%{_sysconfdir}/rc.d/rc4.d/S15snd_init -mkdir -m 755 -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -install -m 0644 %SOURCE101 %{buildroot}/usr/lib/systemd/system/avsystem.service -ln -s ../avsystem.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/avsystem.service +mkdir -m 755 -p %{buildroot}%{_unitdir}/multi-user.target.wants +install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}/avsystem.service +ln -s ../avsystem.service %{buildroot}%{_unitdir}/multi-user.target.wants/avsystem.service %preun if [ $1 == 0 ]; then @@ -97,8 +90,8 @@ systemctl daemon-reload %{_sysconfdir}/rc.d/rc3.d/S15snd_init %{_sysconfdir}/rc.d/rc4.d/S15snd_init %{_bindir}/* -/usr/lib/systemd/system/avsystem.service -/usr/lib/systemd/system/multi-user.target.wants/avsystem.service +%{_unitdir}/avsystem.service +%{_unitdir}/multi-user.target.wants/avsystem.service %files devel %manifest %{name}.manifest diff --git a/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec b/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec index 0d638a3..b80daa8 100644 --- a/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec +++ b/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec @@ -1,7 +1,7 @@ Name: dlog Summary: Logging service Version: 0.4.1 -Release: 15 +Release: 0 Group: System/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -11,20 +11,20 @@ BuildRequires: pkgconfig(libsystemd-journal) BuildRequires: pkgconfig(libtzplatform-config) %description -dlog API library +Logging service dlog API library %package -n libdlog Summary: Logging service dlog API %description -n libdlog -dlog API library +Logging service dlog API library %package -n libdlog-devel Summary: Logging service dlog API Requires: lib%{name} = %{version}-%{release} %description -n libdlog-devel -dlog API library +Logging service dlog API library %package -n dlogutil Summary: Manages dlog configuration @@ -38,10 +38,8 @@ Utilities for managing dlog configuration cp %{SOURCE1} . %build -%autogen -%configure --disable-static - -make %{?jobs:-j%jobs} +%reconfigure --disable-static +%__make %{?jobs:-j%jobs} %install %make_install diff --git a/proto-meta-Tizen_generic/specfile-initial/libmm-session/packaging/libmm-session.spec b/proto-meta-Tizen_generic/specfile-initial/libmm-session/packaging/libmm-session.spec index 5d4ef23..c71ecc7 100644 --- a/proto-meta-Tizen_generic/specfile-initial/libmm-session/packaging/libmm-session.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libmm-session/packaging/libmm-session.spec @@ -5,14 +5,12 @@ Release: 0 Group: Multimedia/Libraries License: Apache-2.0 Source0: libmm-session-%{version}.tar.gz -Source1001: libmm-session.manifest +Source1001: libmm-session.manifest BuildRequires: pkgconfig(audio-session-mgr) BuildRequires: pkgconfig(mm-common) - %description -Multimedia Session Library - +Multimedia Session Library package. %package devel Summary: Multimedia Session Library (Development) @@ -20,29 +18,25 @@ Group: Development/Multimedia Requires: %{name} = %{version}-%{release} %description devel +Multimedia Session Library (Development) %devel_desc %prep %setup -q cp %{SOURCE1001} . - %build - -%autogen CFLAGS="$CFLAGS -Wp,-D_FORTIFY_SOURCE=0" -%configure -make %{?_smp_mflags} +%reconfigure +%__make %{?_smp_mflags} %install %make_install - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %manifest %{name}.manifest %license LICENSE diff --git a/proto-meta-Tizen_generic/specfile-initial/libmm-ta/packaging/libmm-ta.spec b/proto-meta-Tizen_generic/specfile-initial/libmm-ta/packaging/libmm-ta.spec index 379ba04..6e64333 100644 --- a/proto-meta-Tizen_generic/specfile-initial/libmm-ta/packaging/libmm-ta.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libmm-ta/packaging/libmm-ta.spec @@ -1,20 +1,15 @@ -#sbs-git:slp/pkgs/l/libmm-ta libmm-ta 0.1.4 1859a89ab9fa666d844abd894b10584e408604f5 - Name: libmm-ta Summary: Multimedia Framework Time Analysis Lib -Version: 0.1.4 -Release: 2 +Version: 0.1.4 +Release: 0 Group: System/Libraries License: Apache-2.0 Source0: libmm-ta-%{version}.tar.gz -Source1001: libmm-ta.manifest - +Source1001: libmm-ta.manifest %description Multimedia Framework Time Analysis Library - - %package devel Summary: Dev. components for the libmm-ta package (devel) Group: Development/Libraries @@ -23,43 +18,30 @@ Requires: %{name} = %{version}-%{release} %description devel Development components for the libmm-ta package (devel) - %prep %setup -q cp %{SOURCE1001} . - %build - -%autogen --disable-static -%configure --disable-static -make %{?jobs:-j%jobs} +%reconfigure --disable-static +%__make %{?_smp_mflags} %install rm -rf %{buildroot} %make_install - - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - - - - %files %manifest %{name}.manifest %defattr(-,root,root,-) -%_libdir/libmm_ta.so.* - +%{_libdir}/libmm_ta.so.* %files devel %manifest %{name}.manifest %defattr(-,root,root,-) -%_includedir/mm_ta/*.h -%_libdir/*.so -%_libdir/pkgconfig/*.pc - +%{_includedir}/mm_ta/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc diff --git a/proto-meta-Tizen_generic/specfile-initial/libnet-client/packaging/libnet-client.spec b/proto-meta-Tizen_generic/specfile-initial/libnet-client/packaging/libnet-client.spec index 83c1ebc..e04479c 100644 --- a/proto-meta-Tizen_generic/specfile-initial/libnet-client/packaging/libnet-client.spec +++ b/proto-meta-Tizen_generic/specfile-initial/libnet-client/packaging/libnet-client.spec @@ -1,13 +1,13 @@ Name: libnet-client Summary: Network Client library (Shared library) -Version: 0.1.77_37 -Release: 1 +Version: 0.1.77_55 +Release: 0 Group: System/Network License: Flora License Source0: %{name}-%{version}.tar.gz -Source1001: libnet-client.manifest +Source1001: libnet-client.manifest URL: https://review.tizen.org/git/?p=framework/connectivity/libnet-client.git;a=summary -Requires(post): /sbin/ldconfig +Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: cmake BuildRequires: pkgconfig(dlog) @@ -32,13 +32,10 @@ Network Client library (Development) %setup -q cp %{SOURCE1001} . - %build -%autogen.sh -%configure - -make %{?_smp_mflags} - +mkdir -p m4 +%reconfigure +%__make %{?_smp_mflags} %install %make_install diff --git a/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec b/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec index 989f06d..2194f11 100755 --- a/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec +++ b/proto-meta-Tizen_generic/specfile-initial/media-server/packaging/media-server.spec @@ -1,15 +1,15 @@ Name: media-server Summary: File manager service server. -Version: 0.2.46 -Release: 1 +Version: 0.2.46 +Release: 0 Group: Multimedia/Service License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1: media-server.service -Source1001: %{name}.manifest -Source1002: libmedia-utils.manifest -Source1003: libmedia-utils-devel.manifest -Source1004: media-data-sdk_create_db.sh +Source1001: %{name}.manifest +Source1002: libmedia-utils.manifest +Source1003: libmedia-utils-devel.manifest +Source1004: media-data-sdk_create_db.sh Requires(post): /usr/bin/vconftool BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(vconf) @@ -28,16 +28,15 @@ BuildRequires: pkgconfig(libtzplatform-config) Description: File manager service server %package -n libmedia-utils -Summary: media server runtime library. +Summary: Media server runtime library. Group: Multimedia/Libraries Requires: media-server = %{version}-%{release} %description -n libmedia-utils Description : media server runtime library. - %package -n libmedia-utils-devel -Summary: media server development library. +Summary: Media server development library. Group: Development/Multimedia Requires: libmedia-utils = %{version}-%{release} Requires: libtzplatform-config-devel @@ -50,18 +49,18 @@ Description: media server development library. cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} . %build - -%autogen -%configure --prefix=%{_prefix} --disable-static - -make %{?jobs:-j%jobs} +rm -rf autom4te.cache +rm -f aclocal.m4 ltmain.sh +mkdir -p m4 +%reconfigure --prefix=%{_prefix} --disable-static +%__make %{?jobs:-j%jobs} %install %make_install -mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -install -m 644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/media-server.service -ln -s ../media-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/media-server.service +mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants +install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/media-server.service +ln -s ../media-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/media-server.service mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Camera mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Downloads mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Images @@ -98,8 +97,8 @@ chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/data-media %exclude %attr(755,-,-) %{_sysconfdir}/rc.d/init.d/mediasvr %exclude /etc/rc.d/rc3.d/S46mediasvr %exclude /etc/rc.d/rc5.d/S46mediasvr -/usr/lib/systemd/system/media-server.service -/usr/lib/systemd/system/multi-user.target.wants/media-server.service +%{_unitdir}/media-server.service +%{_unitdir}/multi-user.target.wants/media-server.service %license LICENSE.APLv2.0 %{_bindir}/media-data-sdk_create_db.sh %{TZ_SYS_DATA}/data-media/* diff --git a/proto-meta-Tizen_generic/specfile-initial/user-session-units/packaging/user-session-units.spec b/proto-meta-Tizen_generic/specfile-initial/user-session-units/packaging/user-session-units.spec index 8031f72..5ef8985 100644 --- a/proto-meta-Tizen_generic/specfile-initial/user-session-units/packaging/user-session-units.spec +++ b/proto-meta-Tizen_generic/specfile-initial/user-session-units/packaging/user-session-units.spec @@ -1,14 +1,14 @@ %bcond_with x -Name: user-session-units -Version: 8 -Release: 1 -Summary: Systemd session units -Group: System/Base -License: GPL-2.0 -URL: http://foo-projects.org/~sofar/%{name} -Source0: http://foo-projects.org/~sofar/%{name}/%{name}-%{version}.tar.gz -Source1001: user-session-units.manifest -Source1002: user-session.pam +Name: user-session-units +Version: 8 +Release: 0 +Summary: Systemd session units +Group: System/Configuration +License: GPL-2.0 +URL: http://foo-projects.org/~sofar/%{name} +Source0: http://foo-projects.org/~sofar/%{name}/%{name}-%{version}.tar.gz +Source1001: user-session-units.manifest +Source1002: user-session.pam BuildRequires: pkgconfig(systemd) %if %{with x} @@ -22,40 +22,34 @@ BuildRequires: pkgconfig(libsystemd-login) Systemd user session units. %package gnome -Summary: Gnome user session units -Group: System/Base -Requires: user-session-units +Summary: Gnome user session units +Group: System/Configuration +Requires: user-session-units %description gnome -Gnome user session units. +Gnome user session units package. %package enlightenment -Summary: Enlightenment user session units -Group: System/Base -Requires: user-session-units +Summary: Enlightenment user session units +Group: System/Configuration +Requires: user-session-units %description enlightenment -Enlightenment user session units. +Enlightenment user session units package. %prep %setup -q cp %{SOURCE1001} . - %build -%autogen -%configure --enable-gnome --enable-enlightenment - -make %{?_smp_mflags} - +%reconfigure --enable-gnome --enable-enlightenment +%__make %{?_smp_mflags} %install %make_install - install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d install -m 644 %{SOURCE1002} %{buildroot}%{_sysconfdir}/pam.d/user-session - %files %manifest %{name}.manifest %license COPYING @@ -63,7 +57,7 @@ install -m 644 %{SOURCE1002} %{buildroot}%{_sysconfdir}/pam.d/user-session %{_unitdir}/* %exclude %{_unitdir_user}/dbus.socket %exclude %{_unitdir_user}/dbus.service -%{_sysconfdir}/pam.d/user-session +%config %{_sysconfdir}/pam.d/user-session %files enlightenment %manifest %{name}.manifest -- 2.7.4