update spec file

Change-Id: Icc12e415c4ed1b12c83a821de4d77cb9cf08f166
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/proto-meta-Tizen_generic/specfile-initial/alarm-manager/packaging/alarm-manager.spec b/proto-meta-Tizen_generic/specfile-initial/alarm-manager/packaging/alarm-manager.spec
index 4713f6d..d4e49a4 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/alarm-manager/packaging/alarm-manager.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/alarm-manager/packaging/alarm-manager.spec
@@ -10,6 +10,7 @@ Source102:      60-alarm-manager-rtc.rules
 Source103:      alarm-service.conf
 Source1001:     %{name}.manifest
 
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(bundle)
@@ -26,30 +27,30 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
-Alarm Server and devel libraries
+Alarm server and alaram manager libraries.
 
 %package -n alarm-server
-Summary:        Alarm server (devel)
-Requires(post): /usr/bin/systemctl
+Summary:          Alarm server (devel)
+Requires(post):   /usr/bin/systemctl
 Requires(postun): /usr/bin/systemctl
-Requires(preun): /usr/bin/systemctl
+Requires(preun):  /usr/bin/systemctl
 
 %description -n alarm-server
-Alarm Server
+Alarm Server (development files).
 
 %package -n libalarm
-Summary:        Alarm server libraries
+Summary:        Alarm server (libs)
 Requires:       alarm-server = %{version}-%{release}
 
 %description -n libalarm
-Alarm server library
+Alarm server libraries.
 
 %package -n libalarm-devel
-Summary:        Alarm server libraries(devel)
+Summary:        Alarm server libraries (devel)
 Requires:       libalarm = %{version}-%{release}
 
 %description -n libalarm-devel
-Alarm server library (devel)
+Alarm server library (development files).
 
 %prep
 %setup -q
@@ -126,4 +127,3 @@ fi
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libalarm.so
-

diff --git a/proto-meta-Tizen_generic/specfile-initial/gpg2/packaging/gpg2.spec b/proto-meta-Tizen_generic/specfile-initial/gpg2/packaging/gpg2.spec
index 8f1181f..b5face5 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/gpg2/packaging/gpg2.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/gpg2/packaging/gpg2.spec
@@ -6,7 +6,7 @@ Summary:        GnuPG 2
 Url:            http://www.gnupg.org/aegypten2/
 Group:          Security/Certificate Management
 Source:         gnupg-%{version}.tar.bz2
-Source1001:    gpg2.manifest
+Source1001:     gpg2.manifest
 BuildRequires:  automake
 BuildRequires:  expect
 BuildRequires:  fdupes
@@ -19,6 +19,7 @@ BuildRequires:  libgpg-error-devel >= 1.7
 BuildRequires:  libksba-devel >= 1.0.7
 BuildRequires:  libpth-devel >= 1.3.7
 BuildRequires:  readline-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(zlib)
 Provides:       gnupg = %{version}
@@ -36,12 +37,11 @@ gpg-agent, and a keybox library.
 cp %{SOURCE1001} .
 
 %build
-autoreconf -fi
 # build PIEs (position independent executables) for address space randomisation:
 PIE="-fpie"
 export CFLAGS="%{optflags} ${PIE}"
 export LDFLAGS=-pie
-%configure \
+%reconfigure \
     --libexecdir=%{_libdir} \
     --docdir=%{_docdir}/%{name} \
     --with-agent-pgm=%{_bindir}/gpg-agent \
@@ -50,11 +50,11 @@ export LDFLAGS=-pie
     --enable-gpg \
     --with-gnu-ld
 
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %check
 %if ! 0%{?qemu_user_space_build}
-make check
+%__make check
 %{buildroot}%{_bindir}/gpgsplit -v -p pubsplit-                    --uncompress <tests/openpgp/pubring.gpg
 %{buildroot}%{_bindir}/gpgsplit -v -p secsplit- --secret-to-public --uncompress <tests/openpgp/secring.gpg
 %endif
@@ -79,7 +79,6 @@ rm -rf %{buildroot}/%{_datadir}/locale/en@{bold,}quot
 %fdupes %{buildroot}
 
 
-
 %files -f gnupg2.lang
 %manifest %{name}.manifest
 %defattr(-,root,root)
@@ -92,6 +91,4 @@ rm -rf %{buildroot}/%{_datadir}/locale/en@{bold,}quot
 %{_sbindir}/addgnupghome
 %{_sbindir}/applygnupgdefaults
 %{_datadir}/gnupg
-%dir %{_sysconfdir}/gnupg
 %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
-

diff --git a/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec b/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec
index fd0f310..7acb0bd 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec
@@ -1,5 +1,5 @@
 Name:           libmedia-thumbnail
-Version:        0.1.77
+Version:        0.1.78
 Release:        1
 License:        Apache-2.0
 Summary:        Media thumbnail service Library

diff --git a/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec b/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
index 472adc5..e862348 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
@@ -1,12 +1,14 @@
 Name:       libmm-log
 Summary:    Multimedia Framework LOG Lib
 Version:    0.1.5
-Release:    7
-Group:      Multimedia/Multimedia Framework
+Release:    0
+Group:      Multimedia/Media Service
 License:    Apache-2.0
 Source0:    libmm-log-%{version}.tar.gz
-Source1001:    libmm-log.manifest
+Source1001: libmm-log.manifest
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
+
 %description
 Multimedia Framework LOG Library
 
@@ -21,12 +23,11 @@ Multimedia Framework LOG Library (devel)
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1001} .
 
-
 %build
 export CFLAGS+=" -DUSE_DLOG"
 ./autogen.sh
 %configure --disable-static --enable-dlog
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 %make_install
@@ -36,4 +37,3 @@ make %{?jobs:-j%jobs}
 %defattr(-,root,root,-)
 %{_includedir}/mm_log/mm_log.h
 %{_libdir}/pkgconfig/mm-log.pc
-

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 2194f11..b12f808 100755 (executable)
--- 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,6 +1,6 @@
 Name:       media-server
-Summary:    File manager service server.
-Version:    0.2.46
+Summary:    File manager service server
+Version:    0.2.47
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
@@ -11,6 +11,7 @@ Source1002:     libmedia-utils.manifest
 Source1003:     libmedia-utils-devel.manifest
 Source1004:     media-data-sdk_create_db.sh
 Requires(post): /usr/bin/vconftool
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
@@ -22,27 +23,28 @@ BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(notification)
+BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
-Description: File manager service server
+File manager service server (main package).
 
 %package -n libmedia-utils
-Summary:   Media server runtime library.
+Summary:   Media server library
 Group:     Multimedia/Libraries
 Requires:  media-server = %{version}-%{release}
 
 %description -n libmedia-utils
-Description : media server runtime library.
+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
 
 %description -n libmedia-utils-devel
-Description: media server development library.
+Mdia server library (development files).
 
 %prep
 %setup -q
@@ -53,7 +55,7 @@ rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 mkdir -p m4
 %reconfigure --prefix=%{_prefix} --disable-static
-%__make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 %make_install
@@ -66,14 +68,14 @@ mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Downloads
 mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Images
 mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Sounds/Voice\ recorder
 mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Videos
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/mmc
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/phone
+mkdir -p %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/mmc
+mkdir -p %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/phone
 install -m 0775 ./data-media/Images/* %{buildroot}%{TZ_SYS_DATA}/data-media/Images/
-install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/thumb_default.png %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/
-install -D -m 0775 ./data-media/dbspace/file-manager-service/.thumb/mmc/* %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/mmc/
-install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/PHONE_THUMB_HERE %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/phone/
-install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/.jpg* %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/phone/
-install -D -m 0775 ./data-media/dbspace/file-manager-service/* %{buildroot}%{TZ_SYS_DATA}/data-media/file-manager-service/
+install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/thumb_default.png %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/
+install -D -m 0775 ./data-media/dbspace/file-manager-service/.thumb/mmc/* %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/mmc/
+install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/PHONE_THUMB_HERE %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/phone/
+install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/.jpg* %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/phone/
+install -D -m 0775 ./data-media/dbspace/file-manager-service/* %{buildroot}%{TZ_SYS_DATA}/file-manager-service/
 install -m 0775 %{SOURCE1004} %{buildroot}%{_bindir}/media-data-sdk_create_db.sh
 
 %post
@@ -84,6 +86,8 @@ vconftool set -t int file/private/mediaserver/scan_internal "1" -f
 vconftool set -t int file/private/mediaserver/scan_directory "1" -f
 chgrp %TZ_SYS_USER_GROUP %{_bindir}/media-data-sdk_create_db.sh
 chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/data-media
+chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/file-manager-service
+
 %post -n libmedia-utils -p /sbin/ldconfig
 
 %postun -n libmedia-utils -p /sbin/ldconfig
@@ -102,7 +106,8 @@ chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/data-media
 %license LICENSE.APLv2.0
 %{_bindir}/media-data-sdk_create_db.sh
 %{TZ_SYS_DATA}/data-media/*
-%{TZ_SYS_DATA}/data-media/file-manager-service/.thumb/*
+%{TZ_SYS_DATA}/file-manager-service/.thumb/*
+%{TZ_SYS_DATA}/file-manager-service/plugin-config
 
 %files -n libmedia-utils
 %manifest libmedia-utils.manifest

diff --git a/proto-meta-Tizen_generic/specfile-initial/msg-service/packaging/msg-service.spec b/proto-meta-Tizen_generic/specfile-initial/msg-service/packaging/msg-service.spec
index 4e4aa89..2bb2dbf 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/msg-service/packaging/msg-service.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/msg-service/packaging/msg-service.spec
@@ -132,8 +132,6 @@ ln -s %{_sysconfdir}/rc.d/init.d/msg-server  %{buildroot}%{_sysconfdir}/rc.d/rc3
 mkdir -p  %{buildroot}%{_sysconfdir}/rc.d/rc5.d
 ln -s %{_sysconfdir}/rc.d/init.d/msg-server  %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S70msg-server
 
-mkdir -p %{buildroot}/opt/usr/data/msg-service
-
 %if 0%{?simulator}
 rm %{buildroot}/etc/config/sysinfo-message.xml
 mv %{buildroot}/etc/config/sysinfo-message.emul.xml %{buildroot}/etc/config/sysinfo-message.xml