specfiles: update to latest IVI 42/34542/1
authorPatrick Ohly <patrick.ohly@intel.com>
Mon, 26 Jan 2015 09:51:03 +0000 (01:51 -0800)
committerPatrick Ohly <patrick.ohly@intel.com>
Wed, 28 Jan 2015 16:58:57 +0000 (08:58 -0800)
This is the result of gitCloneAll.sh with the following manifest files
(more important ones first):
proto-meta-Tizen_generic/manifest_fix.xml
tizen-ivi_20150127.1_atom.xml

The spec2yoctorc is the one from this repository.

Change-Id: I88299351b7fbd05f37130d1ac2b42b50af1a6c51

33 files changed:
proto-meta-Tizen_generic/specfile-initial/alsa-scenario-0.2/packaging/alsa-scenario.spec
proto-meta-Tizen_generic/specfile-initial/avsystem/packaging/avsystem.spec
proto-meta-Tizen_generic/specfile-initial/chromium/packaging/chromium.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/common/packaging/capi-base-common.spec
proto-meta-Tizen_generic/specfile-initial/contacts-service/packaging/contacts-service.spec
proto-meta-Tizen_generic/specfile-initial/crosswalk-bin [deleted symlink]
proto-meta-Tizen_generic/specfile-initial/crosswalk-bin/packaging/crosswalk-bin.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/crosswalk-bin/packaging/crosswalk.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/devman/packaging/devman.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/doxygen/packaging/doxygen.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/edbus/packaging/edbus.spec
proto-meta-Tizen_generic/specfile-initial/efl-theme-tizen/packaging/efl-theme-tizen-hd.spec
proto-meta-Tizen_generic/specfile-initial/evolution-data-server/packaging/evolution-data-server.spec
proto-meta-Tizen_generic/specfile-initial/gpg2/packaging/gpg2.spec
proto-meta-Tizen_generic/specfile-initial/gumd/packaging/gumd.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/libav/packaging/libav.spec
proto-meta-Tizen_generic/specfile-initial/libdrm/packaging/libdrm.spec
proto-meta-Tizen_generic/specfile-initial/libhaptic/packaging/libhaptic.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/libjpeg-turbo/packaging/libjpeg-turbo.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/libmedia-service/packaging/libmedia-service.spec
proto-meta-Tizen_generic/specfile-initial/libmedia-thumbnail/packaging/libmedia-thumbnail.spec
proto-meta-Tizen_generic/specfile-initial/libmm-log/packaging/libmm-log.spec
proto-meta-Tizen_generic/specfile-initial/libmm-player/packaging/libmm-player.spec
proto-meta-Tizen_generic/specfile-initial/libslp-memo/packaging/libslp-memo.spec
proto-meta-Tizen_generic/specfile-initial/libslp-pm/packaging/libslp-pm.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/libslp-sysman/packaging/sysman.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/message-port/packaging/message-port.spec [deleted file]
proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
proto-meta-Tizen_generic/specfile-initial/phoned/packaging/phoned.spec
proto-meta-Tizen_generic/specfile-initial/pulseaudio/packaging/pulseaudio.spec
proto-meta-Tizen_generic/specfile-initial/system-info/packaging/capi-system-info.spec
proto-meta-Tizen_generic/specfile-initial/tlm/packaging/tlm.spec [new file with mode: 0644]
proto-meta-Tizen_generic/specfile-initial/user-session-units/packaging/user-session-units.spec [deleted file]

index f64d73f..e452bc4 100644 (file)
@@ -1,14 +1,12 @@
-Name:             alsa-scenario
-Summary:          ALSA Scenario pkg
-Version:          0.2.1
-Release:          0
-Group:            Multimedia/Audio FW
-License:          LGPL-2.0+
-Source0:          %{name}-%{version}.tar.gz
-Source1001:       packaging/alsa-scenario.manifest
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires:    pkgconfig(alsa)
+Name:       alsa-scenario
+Summary:    ALSA Scenario pkg
+Version: 0.2.1
+Release:    13
+Group:      Multimedia/Audio
+License:    LGPLv2+
+Source0:    %{name}-%{version}.tar.gz
+Source1001:    alsa-scenario.manifest
+BuildRequires:  pkgconfig(alsa)
 BuildRequires:    pkgconfig
 
 %description
@@ -36,21 +34,20 @@ cp -f %{_datadir}/libtool/config/config.sub %{_builddir}/%{name}-%{version}/
 %__make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
-%manifest alsa-scenario.manifest
+%manifest %{name}.manifest
 %{_libdir}/libascenario-0.2.so.*
 
+
 %files devel
-%manifest alsa-scenario.manifest
+%manifest %{name}.manifest
 %{_includedir}/alsa/*.h
 %{_libdir}/libascenario.so
 %{_libdir}/pkgconfig/libascenario.pc
+
index 6335dff..f706a34 100644 (file)
@@ -1,6 +1,6 @@
 Name:       avsystem
 Summary:    Audio Video System
-Version:    0.5.5
+Version:    0.5.6
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
diff --git a/proto-meta-Tizen_generic/specfile-initial/chromium/packaging/chromium.spec b/proto-meta-Tizen_generic/specfile-initial/chromium/packaging/chromium.spec
deleted file mode 100755 (executable)
index 2c8bb34..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-Name:       chromium
-Summary:    Chromium Library
-Version:    1.0
-Release:    1
-Group:      App Framework/Libraries
-License:    BSD-3-Clause
-Source0:    %{name}-%{version}.tar.gz
-Source1001:    chromium.manifest
-BuildRequires:  cmake
-
-%description
-Chromium library
-
-%package devel
-Summary:    Chromium library - Development Files
-Group:      Development/App Framework
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-%devel_desc
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-%build
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%ifarch %{ix86}
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" %cmake .  -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-%else
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_ARMEL_" %cmake .  -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-%endif
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%manifest %{name}.manifest
-%license LICENSE
-%defattr(-,root,root,-)
-%{_libdir}/libchromium.so*
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/chromium/*
-%{_libdir}/pkgconfig/chromium.pc
index 0dcc591..bd2b9f3 100644 (file)
@@ -1,42 +1,54 @@
-Name:           capi-base-common
-Version:        0.1.0
-Release:        8
-License:        Apache-2.0
-Summary:        Common header files of Tizen Native API
-Group:          API/C API
-Source0:        %{name}-%{version}.tar.gz
-Source1001:    capi-base-common.manifest
-BuildRequires:  cmake
+Name:       capi-base-common
+Summary:    Common header files of Tizen Native API
+Version:    0.1.6
+Release:    0
+Group:      System/API
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+Source1001: capi-base-common.manifest
+
+BuildRequires:    cmake
+Requires(post):   /sbin/ldconfig  
+Requires(postun): /sbin/ldconfig
 
 %description
-Common header files of Tizen Native API
-
-
-%package devel
-Summary:        Common header files of Tizen Native API (Development)
-Group:          API/C API
-Requires:       %{name} = %{version}
-
+This is Common header files of Tizen Native API
+  
+%package devel  
+Summary:  Common header files of Tizen Native API (Development)  
+Group:    System/API
+Requires: %{name} = %{version}-%{release}  
+  
 %description devel
-Common header files of Tizen Native API
+This is Common header files of Tizen Native API
 
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
 %build
-%cmake .
-make %{?_smp_mflags}
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+
+%__make %{?_smp_mflags}
 
 %install
 %make_install
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE %{buildroot}%{_datadir}/license/%{name}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
+%{_libdir}/libcapi-base-common.so*
+%{_datadir}/license/%{name}
 
 %files devel
 %manifest %{name}.manifest
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/capi-base-common.pc
-
+%{_datadir}/license/%{name}
 
index daff01c..2e174cb 100644 (file)
@@ -1,15 +1,14 @@
 Name:       contacts-service
 Summary:    Contacts Service
-Version:    0.10.3
+Version: 0.10.3
 Release:    1
-Group:      Social & Contents/Pim
+Group:      Social & Contents/Contacts
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    contacts-service.service
 Source2:    contacts-service.socket
 Source3:    contacts-service2.manifest
 BuildRequires:  cmake
-BuildRequires:  vconf-keys-devel
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
@@ -35,18 +34,19 @@ Requires(postun): /sbin/ldconfig
 Contacts Service Library
 
 %package -n contacts-service2
-Summary:        New Contacts service library
+Summary:       New Contacts service library
 Requires(post): libprivilege-control-conf
 
 %description -n contacts-service2
-New Contact Serivce Library files
+New Contact Serivce Library
+
 
 %package -n contacts-service2-devel
 Summary:    New Contacts Service  (devel)
 Requires:   %{name}2 = %{version}-%{release}
 
 %description -n contacts-service2-devel
-New Contacts Service Library (devel) files
+New Contacts Service Library (devel)
 
 %prep
 %setup -q
@@ -55,20 +55,20 @@ cp %{SOURCE3} .
 
 %build
 %cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/contacts-service.service
-ln -s ../contacts-service.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/contacts-service.service
+mkdir -p %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants
+install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/user/contacts-service.service
+ln -s ../contacts-service.service %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service
 
-mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
-install -m 0644 %SOURCE2 %{buildroot}%{_unitdir_user}/contacts-service.socket
-ln -s ../contacts-service.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/contacts-service.socket
+mkdir -p %{buildroot}/usr/lib/systemd/user/sockets.target.wants
+install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/user/contacts-service.socket
+ln -s ../contacts-service.socket %{buildroot}/usr/lib/systemd/user/sockets.target.wants/contacts-service.socket
 
 
 %post -n contacts-service2
@@ -90,10 +90,10 @@ vconftool set -t int db/contacts-svc/phonenumber_min_match_digit 8 -g 6005 -s co
 %defattr(-,root,root,-)
 %{_libdir}/libcontacts-service2.so.*
 %{_bindir}/contacts-service-ipcd*
-%{_unitdir_user}/contacts-service.service
-%{_unitdir_user}/tizen-middleware.target.wants/contacts-service.service
-%{_unitdir_user}/sockets.target.wants/contacts-service.socket
-%{_unitdir_user}/contacts-service.socket
+/usr/lib/systemd/user/contacts-service.service
+/usr/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service
+/usr/lib/systemd/user/sockets.target.wants/contacts-service.socket
+/usr/lib/systemd/user/contacts-service.socket
 
 %files -n contacts-service2-devel
 %defattr(-,root,root,-)
diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk-bin b/proto-meta-Tizen_generic/specfile-initial/crosswalk-bin
deleted file mode 120000 (symlink)
index 5cca128..0000000
+++ /dev/null
@@ -1 +0,0 @@
-crosswalk
\ No newline at end of file
diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk-bin/packaging/crosswalk-bin.spec b/proto-meta-Tizen_generic/specfile-initial/crosswalk-bin/packaging/crosswalk-bin.spec
new file mode 100644 (file)
index 0000000..4a8852a
--- /dev/null
@@ -0,0 +1,362 @@
+%bcond_with x
+%bcond_with wayland
+
+%ifarch x86_64 %{arm}
+### x86_64
+# NaCl build on 64bit system require libc 32bit to build the 32 IRT.
+# While Tizen 64bit image does not offer 32bit packages at all,
+# check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
+# So disable nacl for 64bit now.
+### ARM
+# Due to OBS build for ARM some files needed by NaCl to be build
+# are not present.
+%define _disable_nacl 1
+%else
+# Since M39, Google has stopped shipping a 32-bit PNaCl toolchain, so we cannot
+# build NaCl on a fully 32-bit host anymore. See XWALK-2679.
+%define _disable_nacl 1
+%endif
+
+# adjust compression algorithm to speed up RPMS creation
+# source RPM and debug RPMS are big and take too much time
+# when using standard (lzma) compression
+%define _source_payload w3.gzdio
+%define _binary_payload w3.gzdio
+
+Name:           crosswalk
+Version:        11.40.277.0
+Release:        0
+Summary:        Chromium-based app runtime
+License:        (BSD-3-Clause and LGPL-2.1+)
+Group:          Web Framework/Web Run Time
+Url:            https://github.com/otcshare/crosswalk
+Source:         %{name}.tar.gz
+Source1:        xwalk.in
+Source2:        org.crosswalkproject.Runtime1.service
+Source3:        xwalk.service.in
+Source1001:     crosswalk.manifest
+Source1002:     %{name}.xml.in
+Source1003:     %{name}.png
+Source1004:     changedate.py
+Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
+
+BuildRequires:  bison
+BuildRequires:  bzip2-devel
+BuildRequires:  elfutils
+BuildRequires:  expat-devel
+BuildRequires:  flex
+BuildRequires:  binutils-gold
+BuildRequires:  gperf
+BuildRequires:  libcap-devel
+BuildRequires:  libelf-devel
+BuildRequires:  ninja
+BuildRequires:  python
+BuildRequires:  python-xml
+BuildRequires:  perl
+BuildRequires:  which
+BuildRequires:  yasm
+BuildRequires:  pkgconfig(ail)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(appcore-common)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(capi-location-manager)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gles20)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(haptic)
+BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libexif)
+BuildRequires:  pkgconfig(libpci)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(pkgmgr-installer)
+BuildRequires:  pkgconfig(pkgmgr-parser)
+BuildRequires:  pkgconfig(protobuf)
+BuildRequires:  pkgconfig(secure-storage)
+BuildRequires:  pkgconfig(sensor)
+BuildRequires:  pkgconfig(nss)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(xmlsec1)
+%if %{with x}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(xtst)
+%endif
+
+%if "%{profile}" == "ivi"
+BuildRequires:  pkgconfig(murphy-common)
+BuildRequires:  pkgconfig(murphy-resource)
+%endif
+
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(xkbcommon)
+%endif
+Requires:  ca-certificates-tizen
+Requires:  ss-server
+BuildRequires:  crosswalk-thirdparty
+
+%description
+Crosswalk is an app runtime based on Chromium. It is an open source project started by the Intel Open Source Technology Center (http://www.01.org).
+
+%package -n widget-manifest-parser
+Summary:        Widget manifest parser library
+Requires:       %{name} = %{version}
+
+%description -n widget-manifest-parser
+A library parsing widget configuration
+
+%package -n widget-manifest-parser-devel
+Summary:        Widget manifest parser library header
+Requires:       %{name} = %{version}
+Requires:       widget-manifest-parser = %{version}
+
+%description -n widget-manifest-parser-devel
+A header for library parsing widget configuration
+
+%define _manifestdir %TZ_SYS_RO_PACKAGES
+%define _manifestdir_ro %TZ_SYS_RO_PACKAGES
+%define _desktop_icondir %TZ_SYS_RW_ICONS/default/small
+%define _desktop_icondir_ro %TZ_SYS_RO_ICONS/default/small
+%define _dbusservicedir /usr/share/dbus-1/services
+%define _systemduserservicedir /usr/lib/systemd/user
+
+%prep
+%setup -q -n crosswalk
+
+cp %{SOURCE1} .
+cp %{SOURCE3} .
+cp %{SOURCE1001} .
+cp %{SOURCE1002} .
+cp %{SOURCE1003} .
+cp %{SOURCE1004} .
+sed "s/@VERSION@/%{version}/g" %{name}.xml.in > %{name}.xml
+sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.in > xwalk
+sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk.service.in > xwalk.service
+
+# Widget manifest parser devel
+cp src/xwalk/tizen/widget-manifest-parser/widget-manifest-parser.pc.in .
+sed "s|@VERSION@|%{version}|g" widget-manifest-parser.pc.in > widget-manifest-parser.pc
+
+cp -a src/AUTHORS AUTHORS.chromium
+cp -a src/LICENSE LICENSE.chromium
+cp -a src/xwalk/LICENSE LICENSE.xwalk
+
+# The profiles using Wayland (and thus Ozone) do not need this patch.
+%if !%{with wayland}
+%patch10
+%endif
+
+%build
+
+mkdir -p src/out
+tar -zxvf %{_datadir}/crosswalk-thirdparty/out.tgz
+python ./changedate.py
+
+# Stop unconditionally passing -Wall to the compiler. Chromium has its own
+# mechanisms for deciding which parts of the code need -Wall and which need it
+# to be left out (since several pieces are built with -Werror). At least in
+# M39, this is preventing the "rtc_base" target from being built because it
+# does not expect -Wall to be passed to the compiler (see webrtc issue 3307).
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-Wall,,g`
+
+# For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
+# src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's
+# CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246
+export CFLAGS=`echo $CFLAGS | sed s,-fno-omit-frame-pointer,,g`
+
+%if ! %{_disable_nacl}
+# For nacl_bootstrap on ia32. The original CFLAGS set by the gyp
+# native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp already ignored
+# -fstack-protector and -funwind-tables, but Tizen's CFLAGS end up appending them, thus
+# causing linking failures. Check XWALK-1689 for details.
+export CFLAGS=`echo $CFLAGS | sed s,-fstack-protector,,g`
+export CFLAGS=`echo $CFLAGS | sed s,-funwind-tables,,g`
+%endif
+
+# Building the RPM in the GBS chroot fails with errors such as
+#   /usr/lib/gcc/i586-tizen-linux/4.7/../../../../i586-tizen-linux/bin/ld:
+#       failed to set dynamic section sizes: Memory exhausted
+# For now, work around it by passing a GNU ld-specific flag that optimizes the
+# linker for memory usage.
+export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+# Support building in a non-standard directory, possibly outside %{_builddir}.
+# Since the build root is erased every time a new build is performed, one way
+# to avoid losing the build directory is to specify a location outside the
+# build root to the BUILDDIR_NAME definition, such as "/var/tmp/xwalk-build"
+# (remember all paths are still inside the chroot):
+#    gbs build --define 'BUILDDIR_NAME /some/path'
+BUILDDIR_NAME="%{?BUILDDIR_NAME}"
+if [ -n "${BUILDDIR_NAME}" ]; then
+   mkdir -p "${BUILDDIR_NAME}"
+   ln -s "${BUILDDIR_NAME}" src/out
+fi
+
+%if %{with wayland}
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
+%endif
+
+# disable nacl if necessary
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"
+
+# Linking fails when fatal ld warnings are enabled. See XWALK-1379.
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
+
+# For building for arm in OBS, we need :
+# -> to unset sysroot value.
+# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
+# sysroot usage is not needed, we need to use arm libraries from the virtualized environment.
+#
+# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation
+# So force it.
+%ifarch %{arm}
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= "
+export CFLAGS=`echo $CFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+%endif
+
+%ifarch aarch64
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dtarget_arch=arm64 -Duse_allocator=none "
+%endif
+
+%if "%{profile}" == "ivi"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
+%endif
+
+# --no-parallel is added because chroot does not mount a /dev/shm, this will
+# cause python multiprocessing.SemLock error.
+export GYP_GENERATORS='ninja'
+./src/xwalk/gyp_xwalk src/xwalk/xwalk.gyp \
+--no-parallel \
+${GYP_EXTRA_FLAGS} \
+-Dchromeos=0 \
+-Dclang=0 \
+-Dlinux_use_bundled_binutils=0 \
+-Dlinux_use_bundled_gold=0 \
+-Dtizen=1 \
+-Dpython_ver=2.7 \
+-Duse_aura=1 \
+-Duse_cups=0 \
+-Duse_gconf=0 \
+-Duse_gnome_keyring=0 \
+-Duse_kerberos=0 \
+-Duse_system_bzip2=1 \
+-Duse_system_libexif=1 \
+-Duse_system_libxml=1 \
+-Duse_system_nspr=1 \
+-Duse_system_yasm=1 \
+-Dshared_process_mode=1 \
+-Denable_hidpi=1 \
+-Dwerror= \
+-Dskia_warnings_as_errors=0
+
+ninja %{?_smp_mflags} -C src/out/Release xwalk xwalk_launcher xwalk_application_tools widget-manifest-parser
+
+%install
+# Binaries.
+install -p -D %{SOURCE2} %{buildroot}%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
+install -p -D xwalk.service %{buildroot}%{_systemduserservicedir}/xwalk.service
+install -p -D src/out/Release/xwalk %{buildroot}%{_libdir}/xwalk/xwalk
+install -p -D src/out/Release/xwalkctl %{buildroot}%{_bindir}/xwalkctl
+install -p -D src/out/Release/xwalk-launcher %{buildroot}%{_bindir}/xwalk-launcher
+install -p -D src/out/Release/xwalk_backend %{buildroot}%{_libdir}/xwalk/xwalk_backend
+install -p -D src/out/Release/lib/libxwalk_backend_lib.so %{buildroot}%{_libdir}/xwalk/libxwalk_backend_lib.so
+
+# Supporting libraries and resources.
+install -p -D src/out/Release/icudtl.dat %{buildroot}%{_libdir}/xwalk/icudtl.dat
+install -p -D src/out/Release/libffmpegsumo.so %{buildroot}%{_libdir}/xwalk/libffmpegsumo.so
+install -p -D src/out/Release/xwalk.pak %{buildroot}%{_libdir}/xwalk/xwalk.pak
+mkdir -p %{buildroot}%{_datadir}/xwalk
+install -p -D src/xwalk/application/common/tizen/configuration/*.xsd %{buildroot}%{_datadir}/xwalk/
+
+# PNaCl
+%if ! %{_disable_nacl}
+install -p -D src/out/Release/nacl_bootstrap_raw %{buildroot}%{_libdir}/xwalk/nacl_bootstrap_raw
+install -p -D src/out/Release/nacl_helper %{buildroot}%{_libdir}/xwalk/nacl_helper
+install -p -D src/out/Release/nacl_helper_bootstrap %{buildroot}%{_libdir}/xwalk/nacl_helper_bootstrap
+install -p -D src/out/Release/nacl_irt_*.nexe %{buildroot}%{_libdir}/xwalk
+install -p -d %{buildroot}%{_libdir}/xwalk/pnacl
+install -m 0664 -p -D src/out/Release/pnacl/* %{buildroot}%{_libdir}/xwalk/pnacl
+%endif
+
+# Register xwalk to the package manager.
+install -m 0644 -p -D %{name}.xml %{buildroot}%{_manifestdir}/%{name}.xml
+install -m 0644 -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{name}.png
+
+# Widget manifest parser devel
+install -m 0664 -p -D src/xwalk/tizen/widget-manifest-parser/widget-manifest-parser.h %{buildroot}%{_includedir}/widget-manifest-parser/widget-manifest-parser.h
+install -m 0664 -p -D widget-manifest-parser.pc %{buildroot}%{_libdir}/pkgconfig/widget-manifest-parser.pc
+
+# Widget manifest parser
+install -m 0755 -p -D src/out/Release/lib/libwidget-manifest-parser.so %{buildroot}%{_libdir}/libwidget-manifest-parser.so
+
+%post
+mkdir -p %{_desktop_icondir_ro}
+mkdir -p %{_manifestdir_ro}
+
+ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libxpk.so
+ln -sf %{_libdir}/xwalk/libxwalk_backend_lib.so /etc/package-manager/backendlib/libwgt.so
+ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/xpk
+ln -sf %{_libdir}/xwalk/xwalk_backend /etc/package-manager/backend/wgt
+
+%preun
+if [ $1 -eq 0 ] ; then
+ # don't remove if we are upgrade the rpm package
+[ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so
+[ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so
+[ -L /etc/package-manager/backend/xpk ] && rm /etc/package-manager/backend/xpk
+[ -L /etc/package-manager/backend/wgt ] && rm /etc/package-manager/backend/wgt
+fi
+
+%files
+%manifest %{name}.manifest
+%license AUTHORS.chromium LICENSE.chromium LICENSE.xwalk
+%{_bindir}/xwalkctl
+%{_bindir}/xwalk-launcher
+%{_libdir}/xwalk/icudtl.dat
+%{_libdir}/xwalk/libffmpegsumo.so
+%if ! %{_disable_nacl}
+%{_libdir}/xwalk/nacl_bootstrap_raw
+%{_libdir}/xwalk/nacl_helper
+%{_libdir}/xwalk/nacl_helper_bootstrap
+%{_libdir}/xwalk/nacl_irt_*.nexe
+%{_libdir}/xwalk/pnacl/*
+%endif
+%{_libdir}/xwalk/xwalk
+%{_libdir}/xwalk/xwalk.pak
+%{_libdir}/xwalk/libxwalk_backend_lib.so
+%{_libdir}/xwalk/xwalk_backend
+%{_manifestdir}/%{name}.xml
+%{_desktop_icondir}/%{name}.png
+%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
+%{_systemduserservicedir}/xwalk.service
+%{_datadir}/xwalk/*
+
+%files -n widget-manifest-parser
+%{_libdir}/libwidget-manifest-parser.so
+
+%files -n widget-manifest-parser-devel
+%{_includedir}/widget-manifest-parser/widget-manifest-parser.h
+%{_libdir}/pkgconfig/widget-manifest-parser.pc
diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk-bin/packaging/crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/crosswalk-bin/packaging/crosswalk.spec
new file mode 100644 (file)
index 0000000..3bbea3a
--- /dev/null
@@ -0,0 +1,243 @@
+%bcond_with x
+%bcond_with wayland
+
+%define debug_package %{nil}
+%define __debug_install_post %{nil}
+
+%ifarch x86_64 %{arm}
+### x86_64
+
+# NaCl build on 64bit system require libc 32bit to build the 32 IRT.
+# While Tizen 64bit image does not offer 32bit packages at all,
+# check https://bugs.tizen.org/jira/browse/PTREL-803 for details.
+# So disable nacl for 64bit now.
+### ARM
+# Due to OBS build for ARM some files needed by NaCl to be build
+# are not present.
+%define _disable_nacl 1
+%else
+# Since M39, Google has stopped shipping a 32-bit PNaCl toolchain, so we cannot
+# build NaCl on a fully 32-bit host anymore. See XWALK-2679.
+%define _disable_nacl 1
+%endif
+
+# adjust compression algorithm to speed up RPMS creation
+# source RPM and debug RPMS are big and take too much time
+# when using standard (lzma) compression
+%define _source_payload w3.gzdio
+%define _binary_payload w3.gzdio
+
+Name:           crosswalk-thirdparty
+Version:        11.40.277.0
+Release:        0
+Summary:        Chromium-based app runtime
+License:        (BSD-3-Clause and LGPL-2.1+)
+Group:          Web Framework/Web Run Time
+Url:            https://github.com/otcshare/crosswalk
+Source:         crosswalk.tar.gz
+Source1001:     crosswalk-thirdparty.manifest
+Source1002:     xwalk-thirdparty.gyp
+Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
+NoSource:       0
+
+BuildRequires:  bison
+BuildRequires:  bzip2-devel
+BuildRequires:  elfutils
+BuildRequires:  expat-devel
+BuildRequires:  flex
+BuildRequires:  binutils-gold
+BuildRequires:  gperf
+BuildRequires:  libcap-devel
+BuildRequires:  libelf-devel
+BuildRequires:  ninja
+BuildRequires:  python
+BuildRequires:  python-xml
+BuildRequires:  perl
+BuildRequires:  which
+BuildRequires:  yasm
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libpci)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(protobuf)
+Requires:  ca-certificates-tizen
+Requires:  ss-server
+
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(xkbcommon)
+%endif
+
+BuildRequires:  pkgconfig(nss)
+%if %{with x}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(xtst)
+%endif
+
+%if "%{profile}" == "ivi"
+BuildRequires:  pkgconfig(murphy-common)
+BuildRequires:  pkgconfig(murphy-resource)
+%endif
+
+AutoProv:       0
+Provides:       crosswalk-thirdparty
+
+%description
+libraries and binaries of crosswalk project  
+
+%define _dbusservicedir /usr/share/dbus-1/services
+%define _systemduserservicedir /usr/lib/systemd/user
+
+%prep
+%setup -q -n crosswalk
+
+cp %{SOURCE1001} .
+cp %{SOURCE1002} src/xwalk/
+
+
+# The profiles using Wayland (and thus Ozone) do not need this patch.
+%if !%{with wayland}
+%patch10
+%endif
+
+
+%build
+
+
+# Stop unconditionally passing -Wall to the compiler. Chromium has its own
+# mechanisms for deciding which parts of the code need -Wall and which need it
+# to be left out (since several pieces are built with -Werror). At least in
+# M39, this is preventing the "rtc_base" target from being built because it
+# does not expect -Wall to be passed to the compiler (see webrtc issue 3307).
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-Wall,,g`
+
+# Do not use -finline-functions: it breaks the build because it causes -Wall to
+# warn about some conditions that cannot really be reached (ie. variables that
+# may be used uninitialized while in fact thay cannot be uninitialized). See
+# TC-2299.
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-finline-functions,,g`
+
+# For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
+# src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's
+# CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246
+export CFLAGS=`echo $CFLAGS | sed s,-fno-omit-frame-pointer,,g`
+
+%if ! %{_disable_nacl}
+# For nacl_bootstrap on ia32. The original CFLAGS set by the gyp
+# native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp already ignored
+# -fstack-protector and -funwind-tables, but Tizen's CFLAGS end up appending them, thus
+# causing linking failures. Check XWALK-1689 for details.
+export CFLAGS=`echo $CFLAGS | sed s,-fstack-protector,,g`
+export CFLAGS=`echo $CFLAGS | sed s,-funwind-tables,,g`
+%endif
+
+# Building the RPM in the GBS chroot fails with errors such as
+#   /usr/lib/gcc/i586-tizen-linux/4.7/../../../../i586-tizen-linux/bin/ld:
+#       failed to set dynamic section sizes: Memory exhausted
+# For now, work around it by passing a GNU ld-specific flag that optimizes the
+# linker for memory usage.
+export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+# Support building in a non-standard directory, possibly outside %{_builddir}.
+# Since the build root is erased every time a new build is performed, one way
+# to avoid losing the build directory is to specify a location outside the
+# build root to the BUILDDIR_NAME definition, such as "/var/tmp/xwalk-build"
+# (remember all paths are still inside the chroot):
+#    gbs build --define 'BUILDDIR_NAME /some/path'
+BUILDDIR_NAME="%{?BUILDDIR_NAME}"
+if [ -n "${BUILDDIR_NAME}" ]; then
+   mkdir -p "${BUILDDIR_NAME}"
+   ln -s "${BUILDDIR_NAME}" src/out
+fi
+
+%if %{with wayland}
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1"
+%endif
+
+# disable nacl if necessary
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl}"
+
+# Linking fails when fatal ld warnings are enabled. See XWALK-1379.
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
+
+# For building for arm in OBS, we need :
+# -> to unset sysroot value.
+# sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
+# sysroot usage is not needed, we need to use arm libraries from the virtualized environment.
+#
+# Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation
+# So force it.
+%ifarch %{arm}
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dsysroot= "
+export CFLAGS=`echo $CFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
+%endif
+
+%ifarch aarch64
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Dtarget_arch=arm64 -Duse_allocator=none "
+%endif
+
+%if "%{profile}" == "ivi"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
+%endif
+
+
+# --no-parallel is added because chroot does not mount a /dev/shm, this will
+# cause python multiprocessing.SemLock error.
+export GYP_GENERATORS='ninja'
+./src/xwalk/gyp_xwalk src/xwalk/xwalk-thirdparty.gyp \
+--no-parallel \
+${GYP_EXTRA_FLAGS} \
+-Dchromeos=0 \
+-Dclang=0 \
+-Dlinux_use_bundled_binutils=0 \
+-Dlinux_use_bundled_gold=0 \
+-Dtizen=1 \
+-Dpython_ver=2.7 \
+-Duse_aura=1 \
+-Duse_cups=0 \
+-Duse_gconf=0 \
+-Duse_gnome_keyring=0 \
+-Duse_kerberos=0 \
+-Duse_system_bzip2=1 \
+-Duse_system_libexif=1 \
+-Duse_system_libxml=1 \
+-Duse_system_protobuf=1 \
+-Duse_system_yasm=1 \
+-Denable_hidpi=1 \
+-Dwerror= \
+-Dskia_warnings_as_errors=0
+
+ninja %{?_smp_mflags} -C src/out/Release xwalk-thirdparty
+
+%install
+
+
+mkdir  -p %{buildroot}/%{_datadir}/crosswalk-thirdparty/
+tar -zcvf out.tgz src/out
+cp -ar out.tgz %{buildroot}/%{_datadir}/crosswalk-thirdparty/
+
+%files
+%manifest %{name}.manifest
+%{_datadir}/crosswalk-thirdparty/*
+
diff --git a/proto-meta-Tizen_generic/specfile-initial/devman/packaging/devman.spec b/proto-meta-Tizen_generic/specfile-initial/devman/packaging/devman.spec
deleted file mode 100644 (file)
index faf380d..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-Name:       devman
-Summary:    Device manager library
-Version:    0.1.10
-Release:    2
-Group:      System/Libraries
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1:    devman.manifest
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(heynoti)
-BuildRequires:  pkgconfig(haptic)
-BuildRequires:  pkgconfig(device-node)
-
-%description
-Device manager library for device control
-
-
-%package -n libdevman
-Summary:    Device manager library
-Group:      System/Libraries
-
-%description -n libdevman
-Device manager library for device control
-
-%package -n libdevman-devel
-Summary:    Device manager library for (devel)
-Group:      Development/Libraries
-Requires:   libdevman = %{version}-%{release}
-
-%description -n libdevman-devel
-Device manager library for device control (devel)
-
-%package -n libdevman-haptic-devel
-Summary:    Haptic Device manager library for (devel)
-Group:      Development/Libraries
-Requires:   libdevman-devel = %{version}-%{release}
-
-%description -n libdevman-haptic-devel
-Haptic Device manager library for device control (devel)
-
-%prep
-%setup -q
-
-%build
-cp %{SOURCE1} .
-%cmake .
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files -n libdevman
-%manifest %{name}.manifest
-%{_bindir}/display_wd
-%{_libdir}/libdevman.so.*
-
-%files -n libdevman-devel
-%manifest %{name}.manifest
-%{_includedir}/devman/devman.h
-%{_includedir}/devman/devman_managed.h
-%{_includedir}/devman/devman_image.h
-%{_includedir}/devman/devman_haptic.h
-%{_libdir}/pkgconfig/devman.pc
-%{_libdir}/libdevman.so
-
-%files -n libdevman-haptic-devel
-%manifest %{name}.manifest
-%{_includedir}/devman/devman_haptic_ext.h
-%{_includedir}/devman/devman_haptic_ext_core.h
-%{_libdir}/pkgconfig/devman_haptic.pc
diff --git a/proto-meta-Tizen_generic/specfile-initial/doxygen/packaging/doxygen.spec b/proto-meta-Tizen_generic/specfile-initial/doxygen/packaging/doxygen.spec
deleted file mode 100644 (file)
index baf86d1..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-Name:           doxygen
-Version:        1.8.2
-Release:        1
-License:        GPL-2.0+
-Summary:        Automated C, C++, and Java Documentation Generator
-Url:            http://www.stack.nl/~dimitri/doxygen/
-Group:          Development/Tools
-Source:         http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
-Source1001:    doxygen.manifest
-BuildRequires:  bison
-BuildRequires:  flex
-BuildRequires:  gcc-c++
-BuildRequires:  gettext-tools
-%description
-Doxygen is a documentation system for C, C++, Java, and IDL. It can
-generate an online class browser (in HTML) and an offline reference
-manual (in LaTeX) from a set of documented source files. The
-documentation is extracted directly from the sources. Doxygen is
-developed on a Linux platform, but it runs on most other UNIX flavors
-as well. An executable for Windows 95/NT is also available.
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-%build
-unset QTDIR
-./configure \
-   --prefix %{_prefix} \
-   --shared \
-   --release
-make %{?_smp_mflags}
-
-%install
-%make_install
-
-%docs_package
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root)
-%attr(755,root,root) %{_bindir}/*
-
index c4684af..26dc81e 100644 (file)
@@ -1,5 +1,5 @@
 Name:           edbus
-Version:        1.7.8
+Version:        1.7.9
 Release:        0
 License:        BSD-2-Clause
 Summary:        EFL Wrapper for DBus
index 1bc0db6..e10abae 100644 (file)
@@ -1,11 +1,12 @@
 Name:          efl-theme-tizen-hd
 Summary:       Tizen theme files
 Version:       1.0.204r07
-Release:       1
-Group:         System/Libraries
+Release:       0
+Group:         Graphics & UI Framework/Configuration
 License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
 BuildRequires: perl, edje, edje-bin, embryo, embryo-bin
+BuildRequires: pkgconfig(elementary)
 %define _unpackaged_files_terminate_build 0
 
 %description
@@ -15,11 +16,13 @@ Tizen HD theme for EFL
 %package -n efl-theme-tizen-devel
 Summary: Development package
 
+
 %description -n efl-theme-tizen-devel
 Development package
 
+
 %prep
-%setup -q 
+%setup -q
 
 
 %build
@@ -32,18 +35,18 @@ export LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=%{_
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}%{_datadir}/license
-cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}%{_datadir}/license/%{name}
 cp %{buildroot}%{_datadir}/elementary/themes/tizen-HD-dark.edj %{buildroot}%{_datadir}/elementary/themes/tizen-hd.edj
 
 %files
 %defattr(-,root,root,-)
+%license LICENSE
 %{_datadir}/elementary/themes/tizen-HD-dark.edj
 %{_datadir}/elementary/themes/tizen-HD-light.edj
 %{_datadir}/elementary/themes/tizen-hd.edj
 %manifest %{name}.manifest
-%{_datadir}/license/%{name}
+
 
 %files -n efl-theme-tizen-devel
 %defattr(-,root,root,-)
+%license LICENSE
 /opt/var/efl-theme-tizen-edc/*
index a3c1e3d..6051770 100644 (file)
@@ -1,6 +1,6 @@
 %bcond_with introspection
 
-%define baseline 3.11
+%define baseline 3.12
 
 %define USE_EVOLDAP 0
 %define enable_goa no
 %define enable_email no
 
 # should match configure.ac
-%define so_edataserver 17
-%define so_ecal 15
-%define so_edata_cal 20
-%define so_edata_book 17
+%define so_edataserver 18
+%define so_ecal 16
+%define so_edata_cal 23
+%define so_edata_book 20
 %define so_ebook 14
-%define so_camel 43
-%define so_ebackend 6
-%define _evo_version 3.11
+%define so_camel 49
+%define so_ebackend 7
+%define _evo_version 3.12
 
 
 Name:           evolution-data-server
-Version:        3.11.93
+Version:        3.12.2
 Release:        0
 Summary:        Evolution Data Server
 License:        LGPL-2.0+
@@ -64,7 +64,7 @@ BuildRequires:  pkgconfig(oauth)
 %endif
 BuildRequires:  pkgconfig(libical) >= 0.43
 BuildRequires:  pkgconfig(libsecret-unstable) >= 0.5
-BuildRequires:  pkgconfig(libsoup-2.4) >= 2.40.3
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(python-2.7)
 BuildRequires:  pkgconfig(sqlite3) >= 3.5
@@ -260,25 +260,26 @@ cp %{SOURCE1001} .
 # for packaging, so disable it.
 
 %autogen \
         --libexecdir=%{_libexecdir}/evolution-data-server \
         --disable-maintainer-mode \
         --enable-ipv6=%{?enable_ipv6} \
         --enable-smime=%{?enable_smime} \
         --enable-nntp=%{?enable_nntp} \
         --disable-static \
         --disable-uoa \
         --enable-goa=%{?enable_goa} \
         --enable-weather=%{?enable_weather} \
         --enable-gtk=%{?enable_gtk} \
         --enable-google=%{?enable_gdata} \
+ --libexecdir=%{_libexecdir}/evolution-data-server \
+ --disable-maintainer-mode \
+ --enable-ipv6=%{?enable_ipv6} \
+ --enable-smime=%{?enable_smime} \
+ --enable-nntp=%{?enable_nntp} \
+ --disable-static \
+ --disable-uoa \
+ --enable-goa=%{?enable_goa} \
+ --enable-weather=%{?enable_weather} \
+ --enable-gtk=%{?enable_gtk} \
+ --enable-google=%{?enable_gdata} \
 %if %{with introspection}
         --enable-vala-bindings \
         --enable-introspection \
+ --enable-vala-bindings \
+ --enable-introspection \
 %else
         --disable-vala-bindings \
         --disable-introspection \
+ --disable-vala-bindings \
+ --disable-introspection \
 %endif
-          --disable-examples
+ --disable-examples \
+ # end of configure line
 
 %__make %{?_smp_mflags} V=1
 
@@ -335,7 +336,6 @@ find %{buildroot} -name evolution-data-server-%{_evo_version}.mo -execdir mv {}
 %manifest %{name}.manifest
 %license COPYING
 %{_datadir}/GConf/gsettings/evolution-data-server.convert
-%{_datadir}/GConf/gsettings/libedataserver.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml
index 1d0f09d..d340eb8 100644 (file)
@@ -1,5 +1,5 @@
 Name:           gpg2
-Version:        2.0.19
+Version:        2.0.26
 Release:        0
 License:        GPL-3.0+
 Summary:        GnuPG 2
@@ -38,6 +38,7 @@ gpg-agent, and a keybox library.
 cp %{SOURCE1001} .
 
 %build
+%autogen
 # build PIEs (position independent executables) for address space randomisation:
 PIE="-fpie"
 export CFLAGS="%{optflags} ${PIE}"
diff --git a/proto-meta-Tizen_generic/specfile-initial/gumd/packaging/gumd.spec b/proto-meta-Tizen_generic/specfile-initial/gumd/packaging/gumd.spec
new file mode 100644 (file)
index 0000000..e0f93c0
--- /dev/null
@@ -0,0 +1,149 @@
+# define used dbus type [p2p, system]
+%define dbus_type system
+# enable debug features such as control environment variables
+# WARNING! do not use for production builds as it will break security
+%define debug_build 0
+
+Name:    gumd
+Summary: User management daemon and client library
+Version: 1.0.3
+Release: 0
+Group:   Security/Accounts
+License: LGPL-2.1+
+URL:     https://github.com/01org/gumd
+Source:  %{name}-%{version}.tar.gz
+Source1001:     %{name}.manifest
+Source1002:     libgum.manifest
+Source1003:     %{name}-tizen.conf
+Requires:       libgum = %{version}-%{release}
+Conflicts: gum
+%if %{dbus_type} != "p2p"
+Requires: dbus-1
+%endif
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(gtk-doc)
+BuildRequires: pkgconfig(glib-2.0) >= 2.30
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(gmodule-2.0)
+
+
+%description
+%{summary} files
+
+
+%package -n libgum
+Summary:    User management client library
+Group:      Security/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+
+%description -n libgum
+%{summary} files
+
+
+%package -n gum-utils
+Summary:    User management utility tool
+Group:      Security/Libraries
+Requires:   libgum = %{version}-%{release}
+
+
+%description -n gum-utils
+%{summary} files
+
+
+%package -n libgum-devel
+Summary:    Development files for user management client library
+Group:      Security/Libraries
+Requires:   libgum = %{version}-%{release}
+
+
+%description -n libgum-devel
+%{summary} files
+
+
+%package doc
+Summary:    Documentation files for %{name}
+Group:      Security/Documentation
+Requires:   libgum = %{version}-%{release}
+
+
+%description doc
+%{summary} files
+
+
+%prep
+%setup -q -n %{name}-%{version}
+cp -a %{SOURCE1001} %{name}.manifest
+cp -a %{SOURCE1002} libgum.manifest
+
+%build
+%if %{debug_build} == 1
+%configure --enable-dbus-type=%{dbus_type} --enable-debug
+%else
+%configure --enable-dbus-type=%{dbus_type}
+%endif
+%__make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+%make_install
+cp -a %{SOURCE1003} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+
+%post
+ldconfig
+getent group gumd > /dev/null || groupadd -r gumd
+mkdir -p %{_sysconfdir}/%{name}/useradd.d
+mkdir -p %{_sysconfdir}/%{name}/userdel.d
+mkdir -p %{_sysconfdir}/%{name}/groupadd.d
+mkdir -p %{_sysconfdir}/%{name}/groupdel.d
+
+
+%postun -p /sbin/ldconfig
+
+%post -n libgum -p /sbin/ldconfig
+%postun -n libgum -p /sbin/ldconfig
+
+%files -n libgum
+%defattr(-,root,root,-)
+%manifest libgum.manifest
+%{_libdir}/libgum*.so.*
+
+%files -n gum-utils
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%{_bindir}/gum-utils
+
+%files -n libgum-devel
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%{_includedir}/gum/*
+%{_libdir}/libgum*.so
+%{_libdir}/pkgconfig/libgum.pc
+%if %{dbus_type} != "p2p"
+%{_datadir}/dbus-1/interfaces/*UserManagement*.xml
+%endif
+
+%files
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%doc AUTHORS COPYING.LIB NEWS README
+%{_bindir}/%{name}
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%if %{dbus_type} == "system"
+%dir %{_datadir}/dbus-1/system-services
+%{_datadir}/dbus-1/system-services/*UserManagement*.service
+%dir %{_sysconfdir}/dbus-1
+%dir %{_sysconfdir}/dbus-1/system.d
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/gumd-dbus.conf
+%endif
+
+%files doc
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%{_datadir}/gtk-doc/html/gumd/*
index c7d2c3a..14f6964 100644 (file)
@@ -1,33 +1,33 @@
 Name:       libav
 Summary:    AV codec lib
-Version:    9.8
+Version:    11
 Release:    0
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 URL:        http://libav.org
 License:    LGPL-2.1+
 Source0:    %{name}-%{version}.tar.gz
-Source1001: %{name}.manifest
+
 
 %description
 AV codec library
 
 %package -n libavtools
 Summary:    AV tools
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 
 %description -n libavtools
 AV tools binary
 
 %package -n libavcodec
 Summary:    AV codec lib
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 
 %description -n libavcodec
 AV codec library
 
 %package -n libavcodec-devel
 Summary:    AV codec lib (devel)
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 Requires:   libavcodec = %{version}-%{release}
 
 %description -n libavcodec-devel
@@ -35,14 +35,14 @@ AV codec library (devel)
 
 %package -n libavformat
 Summary:    AV format lib
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 
 %description -n libavformat
 AV format library
 
 %package -n libavformat-devel
 Summary:    AV format lib (devel)
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 Requires:   libavformat = %{version}-%{release}
 
 %description -n libavformat-devel
@@ -50,14 +50,14 @@ AV format library (devel)
 
 %package -n libavutil
 Summary:    AV util lib
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 
 %description -n libavutil
 AV util library
 
 %package -n libavutil-devel
 Summary:    AV util lib (devel)
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 Requires:   libavutil = %{version}-%{release}
 
 %description -n libavutil-devel
@@ -65,14 +65,14 @@ AV util library (devel)
 
 %package -n libavfilter
 Summary:    AV util lib
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 
 %description -n libavfilter
 AV filter library
 
 %package -n libavfilter-devel
 Summary:    AV util lib (devel)
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 Requires:   libavfilter = %{version}-%{release}
 
 %description -n libavfilter-devel
@@ -80,181 +80,165 @@ AV filter library (devel)
 
 %package -n libswscale
 Summary:    SW scale lib
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 
 %description -n libswscale
 development files for libswsacle
 
 %package -n libswscale-devel
 Summary:    SW scale lib (devel)
-Group:      Multimedia/Codec
+Group:      Multimedia/Libraries
 Requires:   libswscale = %{version}-%{release}
 
 %description -n libswscale-devel
 development files for libswsacle
 
+
 %prep
 %setup -q
-cp %{SOURCE1001} .
+
 
 %build
-export CONFIGURE_OPTIONS="--enable-shared    --disable-static   \
---disable-version3  --disable-devices   --disable-nonfree --disable-gpl --disable-doc \
---disable-zlib    --disable-network \
---disable-avdevice \
---disable-bsfs      --disable-filters \
---enable-filter=buffer  --enable-filter=buffersink      --enable-filter=crop \
---enable-filter=hflip   --enable-filter=lut     --enable-filter=lutyuv \
---enable-filter=lutrgb  --enable-filter=overlay --enable-filter=scale \
---enable-filter=transpose       --enable-filter=unsharp --enable-filter=vflip \
+
+export CONFIGURE_OPTIONS="\
+--disable-static            --disable-nonfree            --disable-gpl \
+--disable-version3          --disable-devices            --disable-doc \
+--disable-zlib              --disable-network            --disable-avdevice \
+--disable-bsfs              --disable-yasm               --disable-avresample \
+--disable-muxers \
+--disable-filters \
+--enable-filter=buffer      --enable-filter=buffersink  --enable-filter=crop \
+--enable-filter=hflip       --enable-filter=lut         --enable-filter=lutyuv \
+--enable-filter=lutrgb      --enable-filter=overlay     --enable-filter=scale \
+--enable-filter=transpose   --enable-filter=unsharp     --enable-filter=vflip \
 --disable-protocols \
---disable-avresample \
 --enable-protocol=file \
---disable-encoders \
---disable-muxers \
 --disable-parsers \
---enable-parser=aac     --enable-parser=h264            --enable-parser=mpegaudio \
---enable-parser=h263    --enable-parser=mpeg4video      --enable-parser=mpegvideo \
+--enable-parser=aac         --enable-parser=h264        --enable-parser=mpegaudio \
+--enable-parser=h263        --enable-parser=mpeg4video  --enable-parser=mpegvideo \
 --disable-demuxers \
---enable-demuxer=aac    --enable-demuxer=h264   --enable-demuxer=mpegts \
---enable-demuxer=amr    --enable-demuxer=m4v    --enable-demuxer=mpegtsraw \
---enable-demuxer=asf    --enable-demuxer=mmf    --enable-demuxer=mpegvideo \
---enable-demuxer=avi    --enable-demuxer=mov    --enable-demuxer=ogg \
---enable-demuxer=flac   --enable-demuxer=mp3    --enable-demuxer=wav \
---enable-demuxer=h263   --enable-demuxer=mpegps --enable-demuxer=matroska \
---enable-demuxer=dv    --enable-demuxer=flv \
+--enable-demuxer=aac        --enable-demuxer=h264       --enable-demuxer=mpegts \
+--enable-demuxer=amr        --enable-demuxer=m4v        --enable-demuxer=mpegtsraw \
+--enable-demuxer=asf        --enable-demuxer=mmf        --enable-demuxer=mpegvideo \
+--enable-demuxer=avi        --enable-demuxer=mov        --enable-demuxer=ogg \
+--enable-demuxer=flac       --enable-demuxer=mp3        --enable-demuxer=wav \
+--enable-demuxer=h263       --enable-demuxer=mpegps     --enable-demuxer=matroska \
+--enable-demuxer=dv         --enable-demuxer=flv \
 --disable-decoders \
---enable-decoder=alac   --enable-decoder=h264           --enable-decoder=wmv1 \
---enable-decoder=flac   --enable-decoder=mpeg4          --enable-decoder=wmv2 \
---enable-decoder=h263   --enable-decoder=mpegvideo      --enable-decoder=wmv3 \
---enable-decoder=vc1   --enable-decoder=flv \
---enable-decoder=h263i  --enable-decoder=theora  \
---enable-decoder=pcm_alaw  --enable-decoder=pcm_mulaw  \
---enable-encoder=h263   --enable-encoder=h263p  --enable-encoder=mpeg4   \
---enable-decoder=bmp  --enable-encoder=bmp       \
---enable-decoder=tiff \
---enable-decoder=mp3  --enable-decoder=amrnb    \
---enable-encoder=aac  --enable-decoder=aac      \
---enable-swscale        --disable-yasm  \
---enable-fft    --enable-rdft   --enable-mdct   --enable-neon \
+--enable-decoder=alac       --enable-decoder=h264       --enable-decoder=wmv1 \
+--enable-decoder=flac       --enable-decoder=mpeg4      --enable-decoder=wmv2 \
+--enable-decoder=h263       --enable-decoder=mpegvideo  --enable-decoder=wmv3 \
+--enable-decoder=vc1        --enable-decoder=flv        --enable-decoder=amrnb \
+--enable-decoder=tiff       --enable-decoder=mp3        --enable-decoder=h263i \
+--enable-decoder=aac        --enable-decoder=theora     --enable-decoder=pcm_mulaw \
+--enable-decoder=pcm_alaw   --enable-decoder=bmp \
+--disable-encoders \
+--enable-encoder=h263       --enable-encoder=h263p      --enable-encoder=mpeg4 \
+--enable-encoder=bmp        --enable-encoder=aac \
+--enable-swscale            --enable-fft                --enable-rdft \
+--enable-mdct               --enable-neon               --enable-shared \
 "
-%ifarch %{arm}
-export CONFIGURE_OPTIONS+="--disable-mmx"
-%else
-%endif
 
-%ifarch aarch64
-export CONFIGURE_OPTIONS+=" --disable-neon"
+%ifarch %{arm} aarch64
+export CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --disable-mmx "
+%else
 %endif
 
 CFLAGS="%{optflags} -fPIC -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "; export CFLAGS
 
 %ifarch %{arm}
-./configure \
-       --prefix=%{_prefix} \
-       --libdir=%{_libdir} \
-       --shlibdir=%{_libdir} \
-%ifnarch aarch64
-       --extra-cflags="-mfpu=neon" \
-%endif
-       $CONFIGURE_OPTIONS
-%else
-./configure --prefix=%{_prefix} --shlibdir=%{_libdir} --libdir=%{_libdir}  $CONFIGURE_OPTIONS
+export CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --extra-cflags=-mfpu=neon "
 %endif
 
+./configure \
+    --prefix=%{_prefix} \
+    --libdir=%_libdir \
+    --shlibdir=%_libdir \
+    $CONFIGURE_OPTIONS
+
 %__make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 %make_install
-mkdir -p %{buildroot}/%{_datadir}/license
-cp -rf %{_builddir}/%{name}-%{version}/COPYING.LGPLv2.1 %{buildroot}/%{_datadir}/license/libavcodec
-cp -rf %{_builddir}/%{name}-%{version}/COPYING.LGPLv2.1 %{buildroot}/%{_datadir}/license/libavformat
-cp -rf %{_builddir}/%{name}-%{version}/COPYING.LGPLv2.1 %{buildroot}/%{_datadir}/license/libavutil
-cp -rf %{_builddir}/%{name}-%{version}/COPYING.LGPLv2.1 %{buildroot}/%{_datadir}/license/libavfilter
-cp -rf %{_builddir}/%{name}-%{version}/COPYING.LGPLv2.1 %{buildroot}/%{_datadir}/license/libswscale
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%post -n libavcodec -p /sbin/ldconfig
+%postun -n libavcodec -p /sbin/ldconfig
+
+%post -n libavformat -p /sbin/ldconfig
+%postun -n libavformat -p /sbin/ldconfig
+
+%post -n libavutil -p /sbin/ldconfig
+%postun -n libavutil -p /sbin/ldconfig
+
+%post -n libavfilter -p /sbin/ldconfig
+%postun -n libavfilter -p /sbin/ldconfig
+
+%post -n libswscale -p /sbin/ldconfig
+%postun -n libswscale -p /sbin/ldconfig
+
+
 %files -n libavtools
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
 %{_bindir}/av*
 %{_datadir}/avconv/*.avpreset
 
 %files -n libavcodec
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
 %{_libdir}/libavcodec.so.*
-%{_datadir}/license/libavcodec
-%post -n libavcodec -p /sbin/ldconfig
-%postun -n libavcodec -p /sbin/ldconfig
+%license COPYING.LGPLv2.1
 
 %files -n libavformat
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
 %{_libdir}/libavformat.so.*
-%{_datadir}/license/libavformat
-%post -n libavformat -p /sbin/ldconfig
-%postun -n libavformat -p /sbin/ldconfig
+%license COPYING.LGPLv2.1
 
 %files -n libavutil
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
 %{_libdir}/libavutil.so.*
-%{_datadir}/license/libavutil
-%post -n libavutil -p /sbin/ldconfig
-%postun -n libavutil -p /sbin/ldconfig
+%license COPYING.LGPLv2.1
 
 %files -n libavfilter
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
 %{_libdir}/libavfilter.so.*
-%{_datadir}/license/libavfilter
-%post -n libavfilter -p /sbin/ldconfig
-%postun -n libavfilter -p /sbin/ldconfig
+%license COPYING.LGPLv2.1
 
 %files -n libswscale
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
 %{_libdir}/libswscale.so.*
-%{_datadir}/license/libswscale
-%post -n libswscale -p /sbin/ldconfig
-%postun -n libswscale -p /sbin/ldconfig
+%license COPYING.LGPLv2.1
 
 %files -n libavcodec-devel
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_includedir}/libavcodec/*
-%{_libdir}/libavcodec.so
-%{_libdir}/pkgconfig/libavcodec.pc
+%_includedir/libavcodec/*
+%_libdir/libavcodec.so
+%_libdir/pkgconfig/libavcodec.pc
 
 %files -n libavformat-devel
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_includedir}/libavformat/*
-%{_libdir}/libavformat.so
-%{_libdir}/pkgconfig/libavformat.pc
+%_includedir/libavformat/*
+%_libdir/libavformat.so
+%_libdir/pkgconfig/libavformat.pc
 
 %files -n libavutil-devel
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_includedir}/libavutil/*
-%{_libdir}/libavutil.so
-%{_libdir}/pkgconfig/libavutil.pc
+%_includedir/libavutil/*
+%_libdir/libavutil.so
+%_libdir/pkgconfig/libavutil.pc
 
 %files -n libavfilter-devel
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_includedir}/libavfilter/*
-%{_libdir}/libavfilter.so
-%{_libdir}/pkgconfig/libavfilter.pc
+%_includedir/libavfilter/*
+%_libdir/libavfilter.so
+%_libdir/pkgconfig/libavfilter.pc
 
 %files -n libswscale-devel
 %defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_includedir}/libswscale/*
-%{_libdir}/libswscale.so
-%{_libdir}/pkgconfig/libswscale.pc
+%_includedir/libswscale/*
+%_libdir/libswscale.so
+%_libdir/pkgconfig/libswscale.pc
index ab11d00..416afb6 100644 (file)
@@ -1,13 +1,12 @@
 Name:           libdrm
-Version:        2.4.52
-Release:        0
+Version:        2.4.58
+Release:        4
 License:        MIT
 Url:            http://cgit.freedesktop.org/mesa/drm
 Summary:        Userspace interface to kernel DRM services
 Group:          Graphics & UI Framework/Libraries
 Source0:        %{name}-%{version}.tar.bz2
 Source1001:     libdrm.manifest
-
 BuildRequires:  kernel-headers
 BuildRequires:  pkgconfig(pciaccess)
 BuildRequires:  pkgconfig(pthread-stubs)
@@ -16,7 +15,7 @@ BuildRequires:  pkgconfig(pthread-stubs)
 Direct Rendering Manager headers and kernel modules.
 
 %package tools
-Summary:        Diagnostic utilities for DRI and DRM
+Summary:       Diagnostic utilities for DRI and DRM
 Group:          Graphics & UI Framework/Utilities
 Obsoletes:      libdrm < %version-%release
 Provides:       libdrm = %version-%release
@@ -24,6 +23,13 @@ Provides:       libdrm = %version-%release
 %description tools
 Diagnoistic tools to run a test for DRI and DRM
 
+%package tools-exynos
+Summary:       Diagnostic utilities for exynos
+Group:          Graphics & UI Framework/Utilities
+
+%description tools-exynos
+Diagnoistic tools to run a test for exynos
+
 %package devel
 Summary:        Userspace interface to kernel DRM services
 Requires:       kernel-headers
@@ -42,42 +48,41 @@ Development related files.
 Summary:        Userspace interface to kernel DRM buffer management
 
 %description -n libkms
-Userspace interface to kernel DRM buffer management files
+Userspace interface to kernel DRM buffer management
 
 %package intel
 Summary:        Userspace interface to intel graphics kernel DRM buffer management
 
 %description intel
-Userspace interface to intel graphics kernel DRM buffer management files
+Userspace interface to intel graphics kernel DRM buffer management
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
+
 
 %build
+cp %{SOURCE1001} .
 %reconfigure \
         --enable-static=yes  \
         --enable-udev \
         --enable-libkms \
+%ifarch i586 i686 %ix86
         --disable-nouveau-experimental-api \
+%endif
         --disable-radeon \
         --disable-nouveau \
         --enable-exynos-experimental-api \
-        --enable-install-test-programs \
-        --disable-cairo-tests
+       --enable-install-test-programs
 
-%__make %{?_smp_mflags}
-%__make %{?_smp_mflags} -C tests dristat drmstat
+make %{?_smp_mflags}
+make %{?_smp_mflags} -C tests dristat drmstat
 
 %install
 %make_install
-%{__mkdir} -p %{buildroot}%{_bindir}
+%{__mkdir} -p $RPM_BUILD_ROOT/usr/bin
 %{__install}  \
-        tests/.libs/dristat \
-        tests/.libs/drmstat \
-        %{buildroot}%{_bindir}
-
-rm -f %{buildroot}%{_bindir}/kmstest
+       tests/.libs/dristat \
+        tests/.libs/drmstat $RPM_BUILD_ROOT/usr/bin
 
 %post -p /sbin/ldconfig
 
@@ -99,10 +104,17 @@ rm -f %{buildroot}%{_bindir}/kmstest
 
 %files tools
 %manifest %{name}.manifest
-%{_bindir}/dristat
-%{_bindir}/drmstat
-%{_bindir}/modeprint
-%{_bindir}/modetest
+%_bindir/dristat
+%_bindir/drmstat
+%_bindir/kmstest
+%_bindir/modeprint
+%_bindir/modetest
+
+%files tools-exynos
+%manifest %{name}.manifest
+%_bindir/exynos_fimg2d_test
+%_bindir/ipptest
+%_bindir/rottest
 
 %files devel
 %manifest %{name}.manifest
@@ -122,6 +134,7 @@ rm -f %{buildroot}%{_bindir}/kmstest
 %{_libdir}/libdrm_vigs.so
 %{_libdir}/pkgconfig/*
 
+
 %files -n libkms
 %manifest %{name}.manifest
 %{_libdir}/libkms.so.*
diff --git a/proto-meta-Tizen_generic/specfile-initial/libhaptic/packaging/libhaptic.spec b/proto-meta-Tizen_generic/specfile-initial/libhaptic/packaging/libhaptic.spec
deleted file mode 100644 (file)
index 7d85077..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-Name:       libhaptic
-Summary:    Haptic library
-Version:    0.1.0
-Release:    9
-Group:      System/Libraries
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1:    libhaptic.manifest
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(capi-base-common)
-
-%description
-Haptic library for device control
-
-
-%package -n libhaptic-devel
-Summary:    Haptic library for (devel)
-Group:      Development/Libraries
-Requires:   libhaptic = %{version}-%{release}
-
-%description -n libhaptic-devel
-Haptic library for device control (devel)
-
-%package -n libhaptic-plugin-devel
-Summary:    Haptic plugin library for (devel)
-Group:      Development/Libraries
-
-%description -n libhaptic-plugin-devel
-Haptic plugin library for device control (devel)
-
-%prep
-%setup -q
-
-%build
-cp %{SOURCE1} .
-%cmake .
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-mkdir -p %{buildroot}%{_datadir}/license
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files -n libhaptic
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libhaptic.so.*
-%{_datadir}/license/haptic
-
-%files -n libhaptic-devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/haptic/haptic.h
-%{_includedir}/haptic/SLP_HAPTIC_PG.h
-%{_libdir}/libhaptic.so
-%{_libdir}/pkgconfig/haptic.pc
-
-%files -n libhaptic-plugin-devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/haptic/haptic_module.h
-%{_includedir}/haptic/haptic_plugin_intf.h
-%{_libdir}/pkgconfig/haptic-plugin.pc
-
diff --git a/proto-meta-Tizen_generic/specfile-initial/libjpeg-turbo/packaging/libjpeg-turbo.spec b/proto-meta-Tizen_generic/specfile-initial/libjpeg-turbo/packaging/libjpeg-turbo.spec
deleted file mode 100644 (file)
index a1c9b40..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-%define major   8
-%define minor   0
-%define micro   2
-%define srcver  1.2.1
-%define libver  %{major}.%{minor}.%{micro}
-# major number of library from jpeg8
-%define cmajor  8
-
-Name:           libjpeg-turbo
-Version:        %{srcver}
-Release:        0
-Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
-License:        BSD-3-Clause
-Group:          Graphics & UI Framework/Libraries
-Url:            http://sourceforge.net/projects/libjpeg-turbo
-Source0:        http://downloads.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source1:        baselibs.conf
-Source1001:    libjpeg-turbo.manifest
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  yasm
-
-%description
-The libjpeg-turbo package contains a library of functions for manipulating
-JPEG images.
-
-%package -n libjpeg
-
-Version:        %{libver}
-Release:        0
-Summary:        The MMX/SSE accelerated JPEG compression/decompression library
-Group:          Graphics & UI Framework/Libraries
-
-Provides:       libjpeg = %{version}
-Provides:       libjpeg8
-Obsoletes:      libjpeg < %{version}
-
-%description -n libjpeg
-This library contains MMX/SSE accelerated functions for manipulating
-JPEG images.
-
-%package -n libjpeg-devel
-Version:        %{libver}
-Release:        0
-Summary:        Development Tools for applications which will use the Libjpeg Library
-Group:          Graphics & UI Framework/Development
-
-Provides:       libjpeg-turbo-devel
-Requires:       libjpeg = %{version}
-Provides:       libjpeg-devel = %{version}
-Provides:       libjpeg8-devel
-Obsoletes:      libjpeg-devel < %{version}
-%if "%{major}" != "%{cmajor}"
-Conflicts:      libjpeg-devel
-%endif
-
-%description -n libjpeg-devel
-The libjpeg-devel package includes the header files and libraries
-necessary for compiling and linking programs which will manipulate JPEG
-files using the libjpeg library.
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-%build
-autoreconf -fiv
-%configure --disable-static \
-           --with-jpeg8
-make %{?_smp_mflags}
-
-%check
-make test libdir=%{_libdir}
-
-%install
-%makeinstall
-
-# Fix perms
-chmod -x README-turbo.txt release/copyright
-
-# Remove unwanted files
-rm -f %{buildroot}%{_libdir}/lib{,turbo}jpeg.la
-
-rm %{buildroot}%{_bindir}/tjbench
-
-# Remove docs, we'll select docs manually
-rm -rf %{buildroot}%{_datadir}/doc/
-
-%post -n libjpeg -p /sbin/ldconfig
-
-%postun -n libjpeg -p /sbin/ldconfig
-
-%docs_package
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root)
-%license release/copyright 
-%{_bindir}/*
-
-%files -n libjpeg
-%manifest %{name}.manifest
-%defattr(-,root,root)
-%{_libdir}/libturbojpeg.so
-%{_libdir}/libjpeg.so.%{libver}
-%{_libdir}/libjpeg.so.%{major}
-
-%files -n libjpeg-devel
-%manifest %{name}.manifest
-%defattr(-,root,root)
-%{_includedir}/*.h
-%{_libdir}/libjpeg.so
-%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
-
-%changelog
index 4164ae0..30dae57 100755 (executable)
@@ -1,11 +1,11 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version:    0.2.44
-Release:    0
+Version: 0.2.44
+Release:    3
 Group:      System/Libraries
-License:    Apache-2.0
+License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001: libmedia-service.manifest
+Source1001:    libmedia-service.manifest
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -22,30 +22,37 @@ BuildRequires:  pkgconfig(mm-fileinfo)
 BuildRequires:  pkgconfig(media-thumbnail)
 BuildRequires:  pkgconfig(drm-client)
 BuildRequires:  pkgconfig(libmedia-utils)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
-Media information service library for multimedia applications files
+Media information service library for multimedia applications
 
 %package devel
-Summary:    Media information service library for multimedia applications. (dev)
+Summary:    Media information service library for multimedia applications. (development)
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
 Media information service library for multimedia applications. (development files)
 
+
 %prep
 %setup -q 
 cp %{SOURCE1001} .
 
+
 %build
 %cmake . 
-%__make %{?_smp_mflags}
+make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
+#License
+mkdir -p %{buildroot}/%{_datadir}/license
+cp -rf %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/%{_datadir}/license/%{name}
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -61,7 +68,8 @@ rm -rf %{buildroot}
 %{_libdir}/libmedia-content-plugin.so
 %{_libdir}/libmedia-content-plugin.so.1
 %{_libdir}/libmedia-content-plugin.so.1.0.0
-%license LICENSE
+#License
+%{_datadir}/license/%{name}
 
 %files devel
 %manifest %{name}.manifest
index 7fb7d29..4e466b5 100644 (file)
@@ -1,6 +1,6 @@
 Name:           libmedia-thumbnail
 Version:        0.1.78
-Release:        1
+Release:        0
 License:        Apache-2.0
 Summary:        Media thumbnail service Library
 Group:          Multimedia/Libraries
@@ -29,21 +29,21 @@ Media thumbnail service library for multimedia applications.
 
 %package devel
 Summary:        Media Thumbnail Service Library (development)
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Media thumbnail service library for multimedia applications. (development)
 
 %package -n media-thumbnail-server
 Summary:        Thumbnail generator
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n media-thumbnail-server
 Media Thumbnail Server.
 
 %package test
 Summary:        Thumbnail generator Tests
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description test
 Media Thumbnail Tests.
index 038daf1..89903cf 100644 (file)
@@ -1,16 +1,18 @@
 Name:       libmm-log
 Summary:    Multimedia Framework LOG Lib
-Version:    0.1.5
-Release:    0
-Group:      Multimedia/Multimedia Framework
+Version:    0.1.9
+Release:    18
+VCS:        framework/multimedia/libmm-log#libmm-log_0.1.5-6-18-g93d660f3979dfbde901e8d2c6cdc6d9d78ce3442
+Group:      Multimedia/LOG
 License:    Apache-2.0
 Source0:    libmm-log-%{version}.tar.gz
-Source1001: libmm-log.manifest
 BuildRequires:  pkgconfig(dlog)
 
 %description
 Multimedia Framework LOG Library
 
+
+
 %package devel
 Summary:    Multimedia Framework LOG Lib (devel)
 Group:      Development/Libraries
@@ -18,21 +20,36 @@ Group:      Development/Libraries
 %description devel
 Multimedia Framework LOG Library (devel)
 
+
 %prep
 %setup -q -n %{name}-%{version}
-cp %{SOURCE1001} .
+./autogen.sh
+
 
 %build
-CFLAGS="$CFLAGS -DUSE_DLOG"; export CFLAGS
-./autogen.sh
-%configure --disable-static --enable-dlog
-%__make %{?_smp_mflags}
+export CFLAGS+=" -DUSE_DLOG"
+%if 0%{?tizen_build_binary_release_type_eng}
+export CFLAGS+=" -DTIZEN_ENGINEER_MODE"
+%endif
+
+
+%configure --disable-static \
+%if 0%{?tizen_build_binary_release_type_eng}
+       --enable-engineer_mode \
+%endif
+    --prefix=%{_prefix} --enable-dlog
+
+make %{?jobs:-j%jobs}
 
 %install
+rm -rf %{buildroot}
 %make_install
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 
 %files devel
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
+%{_datadir}/license/%{name}
 %{_includedir}/mm_log/mm_log.h
 %{_libdir}/pkgconfig/mm-log.pc
+
index 459d342..1bcc4a0 100644 (file)
@@ -1,7 +1,7 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
 Version:    0.2.27
-Release:    0
+Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
 URL:        http://source.tizen.org
index 512ea49..f78c335 100755 (executable)
@@ -18,7 +18,7 @@ BuildRequires:  cmake
 library for memo(development package)
 
 %package devel
-Summary:    Development for %{name}
+Summary:    Development files for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
@@ -30,9 +30,10 @@ Development files for %{name}
 cp %{SOURCE1001} .
 
 %build
-export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--hash-style=both"
+export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--hash-style=both"
 %cmake .
-%__make %{?_smp_mflags}
+
+make %{?jobs:-j%jobs}
 
 %install
 %make_install
@@ -44,6 +45,7 @@ CREATE TABLE if not exists memo ( id INTEGER PRIMARY KEY autoincrement, content
                               '
 /sbin/ldconfig
 
+
 # Change file owner
 chown :%{TZ_SYS_USER_GROUP} %{TZ_SYS_DB}/.memo.db
 chown :%{TZ_SYS_USER_GROUP} %{TZ_SYS_DB}/.memo.db-journal
@@ -59,6 +61,7 @@ chsmack -a 'User' %{TZ_SYS_DB}/.memo.db*
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
+%manifest libslp-memo.manifest
 %{_libdir}/*.so.*
 
 %files devel
diff --git a/proto-meta-Tizen_generic/specfile-initial/libslp-pm/packaging/libslp-pm.spec b/proto-meta-Tizen_generic/specfile-initial/libslp-pm/packaging/libslp-pm.spec
deleted file mode 100755 (executable)
index 6cbded5..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-Name:       libslp-pm
-Summary:    Power manager library
-Version:    1.2.4
-Release:    0
-Group:      System/Libraries
-License:    Apache-2.0
-Source0:    libslp-pm-%{version}.tar.bz2
-Source1001: libslp-pm.manifest
-BuildRequires:  cmake
-
-%description
-Samsung Linux platform power manager client library
-
-%package devel
-Summary:    SLP power manager client (devel)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-SLP power manager client library (devel)
-
-%prep
-%setup -q 
-cp %{SOURCE1001} .
-
-%build
-%cmake .
-%__make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libpmapi.so.1.2
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/pmapi.h
-%{_includedir}/pmapi_managed.h
-%{_includedir}/SLP_pm_PG.h
-%{_libdir}/pkgconfig/pmapi.pc
-%{_libdir}/libpmapi.so
diff --git a/proto-meta-Tizen_generic/specfile-initial/libslp-sysman/packaging/sysman.spec b/proto-meta-Tizen_generic/specfile-initial/libslp-sysman/packaging/sysman.spec
deleted file mode 100644 (file)
index d3aa36d..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-Name:       sysman
-Summary:    System manager interface library
-Version: 0.2.29
-Release:    1
-Group:      framework-system
-License:    APLv2
-Source0:    %{name}-%{version}.tar.gz
-Source1001: sysman.manifest 
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(devman_plugin)
-
-%description
-system manager internal library
-
-
-
-%package devel
-Summary:    System Manager base (devel)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-System Manager base library (devel)
-
-%package internal-devel
-Summary:    System Manager base (devel)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   sysman
-
-%description internal-devel
-System Manager base library (devel)
-
-
-%prep
-%setup -q 
-
-%build
-cp %{SOURCE1001} .
-%cmake .
-
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/
-ln -s %{_bindir}/regpmon.sh %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S99regpmon
-ln -s %{_bindir}/regpmon.sh %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S99regpmon
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/*.so.*
-%{_bindir}/*
-%{_sysconfdir}/rc.d/init.d/*
-%{_sysconfdir}/rc.d/rc3.d/*
-%{_sysconfdir}/rc.d/rc5.d/*
-
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/sysman/sysman.h
-%{_includedir}/sysman/sysman_managed.h
-%{_includedir}/sysman/SLP_sysman_PG.h
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
-
-%files internal-devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/sysman/sysman-internal.h
-
diff --git a/proto-meta-Tizen_generic/specfile-initial/message-port/packaging/message-port.spec b/proto-meta-Tizen_generic/specfile-initial/message-port/packaging/message-port.spec
deleted file mode 100644 (file)
index 71e4aab..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-
-%define build_tests 1
-%define use_session_bus 0
-%define systemddir /lib/systemd
-
-Name: message-port
-Summary: Message port daemon
-Version: 1.0.2
-Release: 1
-Group: System/Service
-License: LGPL-2.1+
-Source0: %{name}-%{version}.tar.gz
-Source1: %{name}.manifest
-
-BuildRequires: pkgconfig(aul)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(gio-unix-2.0)
-BuildRequires: pkgconfig(glib-2.0) >= 2.30
-BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(pkgmgr-info)
-
-%description
-This daemon allows the webapplications to communicates using 
-Tizen MessagePort WebAPI.
-
-
-%package -n lib%{name}
-Summary:    Client library for message port
-Group:      Base/Libraries
-Requires(post):   /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: %{name} = %{version}-%{release} 
-BuildRequires: pkgconfig(bundle)
-
-%description -n lib%{name}
-Client library that porvies C APIs to work with message port.
-
-
-%package -n lib%{name}-devel
-Summary:    Development files for libmessage-port 
-Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
-
-%description -n lib%{name}-devel
-Development files for message-port client library.
-
-%if %{build_tests} == 1
-
-%package -n %{name}-tests
-Summary: Unit tests for messageport
-Group: Development/Testing
-Requires: lib%{name} = %{version}-%{release}
-
-%description -n %{name}-tests
-Unit tests for messageport implementation.
-
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{version}
-cp -a %{SOURCE1} .
-mkdir m4 > /dev/null
-autoreconf -f -i
-
-
-%build
-%configure \
-%if %{build_tests} == 1
-     --enable-tests\
-%endif
-%if %{use_session_bus} == 1
-    --enable-sessionbus \
-%endif
-
-make %{?_smp_mflags}
-
-
-%install
-%make_install
-
-mkdir -p ${RPM_BUILD_ROOT}%{systemddir}/system
-cp messageportd.service $RPM_BUILD_ROOT%{systemddir}/system
-
-%post
-/bin/systemctl enable messageportd.service
-
-%postun
-/bin/systemctl disable messageportd.service
-
-%post -n lib%{name}
-/sbin/ldconfig
-
-%postun -n lib%{name}
-/sbin/ldconfig
-
-
-# daemon: message-port
-%files -n %{name}
-%defattr(-,root,root,-)
-%{_bindir}/messageportd
-%if %{use_session_bus} == 1
-%{_datadir}/dbus-1/services/org.tizen.messageport.service
-%manifest %{name}.manifest
-%endif
-%{systemddir}/system/messageportd.service
-
-# libmessage-port
-%files -n lib%{name}
-%defattr(-,root,root,-)
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING.LIB README
-%{_libdir}/lib%{name}.so*
-
-
-#libmessage-port-devel
-%files -n lib%{name}-devel
-%defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_libdir}/pkgconfig/%{name}.pc
-%{_includedir}/*.h
-
-%if %{build_tests} == 1
-%files -n %{name}-tests
-%defattr(-,root,root,-)
-%manifest %{name}.manifest
-%{_bindir}/msgport-test-app
-%{_bindir}/msgport-test-app-cpp
-%endif
index 07bcee0..0c6b158 100644 (file)
@@ -1,10 +1,4 @@
-# For information about rpm conditional builds supports
-#
-#    * http://www.rpm.org/wiki/PackagerDocs/ConditionalBuilds
-#
-# WARNING: bcond_without and bcond_with macro are very tricky
-
-#These options are ACTIVATED by default.
+# These are on by default, unless explicitly disabled.
 %bcond_without lua
 %bcond_without pulse
 %bcond_without ecore
 %bcond_without websockets
 %bcond_without smack
 %bcond_without sysmon
-%bcond_without squashpkg
 
-#These options are DEACTIVATED by default but the prjconf of the OBS project can activate them.
+# These are off by default, unless explicitly enabled.
+#
+# Notes:
+#   By default we build with distro-default compilation flags which
+#   enables optimizations. If you want to build with full debugging
+#   ie. with optimization turned off and full debug info (-O0 -g3)
+#   pass '--with debug' to rpmbuild on the command line. Similary
+#   you can chose to compile with/without pulse, ecore, glib, qt,
+#   dbus, and telephony support.
+#
+#   qt is the macro for controlling Qt4 support, which is not supported
+#   in Tizen any more. qt5 is the corrsponding macro for controlling
+#   Qt5 support.
+#
 %bcond_with icosyscon
-#"qt" macro is for qt4 support
-#that is no longer supported in Tizen
-#for the support of qt5, use the macro "qt5"
 %bcond_with qt
 %bcond_with debug
 
-# By default we build with distro-default compilation flags which
-# enables optimizations. If you want to build with full debugging
-# ie. with optimization turned off and full debug info (-O0 -g3)
-# pass '--with debug' to rpmbuild on the command line. Similary
-# you can chose to compile with/without pulse, ecore, glib, qt,
-# dbus, and telephony support. --without squashpkg will prevent
-# squashing the -core and -plugins-base packages into the base
-# murphy package.
 
 Summary: Resource policy framework
-Name:    murphy
-Version: 0.0.67
+Name: murphy
+Version: 0.0.74
 Release: 1
 License: BSD-3-Clause
-Group:   System/Service
-URL:     http://01.org/murphy/
-Source0:    %{name}-%{version}.tar.gz
+Group: System/Service
+URL: http://01.org/murphy/
+Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%endif
-
 Requires(post): /bin/systemctl
 Requires(post): libcap-tools
 Requires(postun): /bin/systemctl
@@ -102,32 +93,10 @@ BuildRequires: libxml2-devel
 %description
 This package contains the basic Murphy daemon.
 
-%if %{with squashpkg}
-%package core
-Summary: Murphy core runtime libraries
-Group: System/Libraries
-
-%description core
-This package contains the core runtime libraries.
-
-%package plugins-base
-Summary: The basic set of Murphy plugins
-Group: System/Service
-Requires: %{name} = %{version}
-Requires: %{name}-core = %{version}
-
-%description plugins-base
-This package contains a basic set of plugins.
-%endif
-
 %package devel
 Summary: The header files and libraries needed for Murphy development
 Group: System/Libraries
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 Requires: libjson-devel
 
 %description devel
@@ -144,11 +113,7 @@ This package contains documentation.
 %package pulse
 Summary: Murphy PulseAudio mainloop integration
 Group: System/Libraries
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description pulse
 This package contains the Murphy PulseAudio mainloop integration runtime files.
@@ -157,11 +122,7 @@ This package contains the Murphy PulseAudio mainloop integration runtime files.
 Summary: Murphy PulseAudio mainloop integration development files
 Group: System/Libraries
 Requires: %{name}-pulse = %{version}
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description pulse-devel
 This package contains the Murphy PulseAudio mainloop integration development
@@ -172,11 +133,7 @@ files.
 %package ecore
 Summary: Murphy EFL/ecore mainloop integration
 Group: System/Libraries
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description ecore
 This package contains the Murphy EFL/ecore mainloop integration runtime files.
@@ -185,11 +142,7 @@ This package contains the Murphy EFL/ecore mainloop integration runtime files.
 Summary: Murphy EFL/ecore mainloop integration development files
 Group: System/Libraries
 Requires: %{name}-ecore = %{version}
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description ecore-devel
 This package contains the Murphy EFL/ecore mainloop integration development
@@ -200,11 +153,7 @@ files.
 %package glib
 Summary: Murphy glib mainloop integration
 Group: System/Libraries
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description glib
 This package contains the Murphy glib mainloop integration runtime files.
@@ -213,11 +162,7 @@ This package contains the Murphy glib mainloop integration runtime files.
 Summary: Murphy glib mainloop integration development files
 Group: System/Libraries
 Requires: %{name}-glib = %{version}
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description glib-devel
 This package contains the Murphy glib mainloop integration development
@@ -228,11 +173,7 @@ files.
 %package qt
 Summary: Murphy Qt mainloop integration
 Group: System/Libraries
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description qt
 This package contains the Murphy Qt mainloop integration runtime files.
@@ -241,11 +182,7 @@ This package contains the Murphy Qt mainloop integration runtime files.
 Summary: Murphy Qt mainloop integration development files
 Group: System/Libraries
 Requires: %{name}-qt = %{version}
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description qt-devel
 This package contains the Murphy Qt mainloop integration development
@@ -274,22 +211,11 @@ plugins.
 Summary: Various test binaries for Murphy
 Group: System/Testing
 Requires: %{name} = %{version}
-%if %{with squashpkg}
-Requires: %{name}-core = %{version}
-%else
 Requires: %{name} = %{version}
-%endif
 
 %description tests
 This package contains various test binaries for Murphy.
 
-%package ivi-resource-manager
-Summary: Murphy IVI resource manager plugin
-Group: System/Service
-
-%description ivi-resource-manager
-This package contains the Murphy IVI resource manager plugin.
-
 %if %{with icosyscon}
 %package system-controller
 Summary: Murphy IVI System Controller plugin
@@ -319,7 +245,7 @@ V="V=1"
 %endif
 
 CONFIG_OPTIONS=""
-DYNAMIC_PLUGINS="domain-control,system-controller,ivi-resource-manager"
+DYNAMIC_PLUGINS="domain-control,system-controller"
 
 %if %{with pulse}
 CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-gpl --enable-pulse"
@@ -409,20 +335,20 @@ rm -f %{buildroot}%{_libdir}/murphy/*.la
 
 # Generate list of linkedin plugins (depends on the configuration).
 outdir="`pwd`"
-cd %{buildroot} 
+pushd %{buildroot}
 find ./%{_libdir} -name libmurphy-plugin-*.so* | \
-sed 's#^./*#/#g' > $outdir/filelist.plugins-base 
-cd $(outdir)
+sed 's#^./*#/#g' > $outdir/filelist.plugins-base
+popd
 echo "Found the following linked-in plugin files:"
 cat $outdir/filelist.plugins-base | sed 's/^/    /g'
 
 # Generate list of header files, filtering ones that go to subpackages.
 outdir="`pwd`"
-cd %{buildroot}
+pushd %{buildroot}
 find ./%{_includedir}/murphy | \
 grep -E -v '((pulse)|(ecore)|(glib)|(qt))-glue' | \
-sed 's#^./*#/#g' > $outdir/filelist.devel-includes 
-cd $(outdir)
+sed 's#^./*#/#g' > $outdir/filelist.devel-includes
+popd
 
 # Replace the default sample/test config files with the packaging ones.
 rm -f %{buildroot}%{_sysconfdir}/murphy/*
@@ -470,20 +396,6 @@ systemctl --user disable --global murphyd.service
 fi
 ldconfig
 
-%if %{with squashpkg}
-%post core
-ldconfig
-
-%postun core
-ldconfig
-
-%post plugins-base
-ldconfig
-
-%postun plugins-base
-ldconfig
-%endif
-
 %if %{with glib}
 %post glib
 ldconfig
@@ -522,11 +434,7 @@ ldconfig
 %postun gam
 ldconfig
 
-%if %{with squashpkg}
 %files -f filelist.plugins-base
-%else
-%files
-%endif
 %defattr(-,root,root,-)
 %manifest murphy.manifest
 %{_bindir}/murphyd
@@ -544,10 +452,6 @@ ldconfig
 %{_datadir}/murphy
 %endif
 
-%if %{with squashpkg}
-%files core
-%defattr(-,root,root,-)
-%endif
 %{_libdir}/libmurphy-common.so.*
 %{_libdir}/libmurphy-core.so.*
 %{_libdir}/libmurphy-resolver.so.*
@@ -564,27 +468,16 @@ ldconfig
 %{_libdir}/libmurphy-libdbus.so.*
 %{_libdir}/libmurphy-dbus-libdbus.so.*
 %endif
-
-%if %{with squashpkg}
-%files plugins-base -f filelist.plugins-base
-%defattr(-,root,root,-)
+%if %{with sysmon}
+%{_libdir}/libmurphy-libdbus.so.*
 %endif
+
 %{_libdir}/murphy/plugins/plugin-domain-control.so
 %{_libdir}/murphy/plugins/plugin-resource-asm.so
 %{_libdir}/murphy/plugins/plugin-resource-native.so
 
 %files devel -f filelist.devel-includes
 %defattr(-,root,root,-)
-# %%{_includedir}/murphy/config.h
-# %%{_includedir}/murphy/common.h
-# %%{_includedir}/murphy/core.h
-# %%{_includedir}/murphy/common
-# %%{_includedir}/murphy/core
-# %%{_includedir}/murphy/resolver
-# %%{_includedir}/murphy/resource
-# # hmmm... should handle disabled plugins properly.
-# %%{_includedir}/murphy/domain-control
-# %%{_includedir}/murphy/plugins
 %{_includedir}/murphy-db
 %{_libdir}/libmurphy-common.so
 %{_libdir}/libmurphy-core.so
@@ -600,7 +493,6 @@ ldconfig
 %{_libdir}/pkgconfig/murphy-common.pc
 %{_libdir}/pkgconfig/murphy-core.pc
 %{_libdir}/pkgconfig/murphy-resolver.pc
-# %%{_libdir}/pkgconfig/murphy-resource.pc
 %if %{with lua}
 %{_libdir}/pkgconfig/murphy-lua-utils.pc
 %{_libdir}/pkgconfig/murphy-lua-decision.pc
@@ -612,7 +504,6 @@ ldconfig
 %{_libdir}/libbreedline*.so
 %{_libdir}/pkgconfig/breedline*.pc
 %if %{with dbus}
-# %%{_includedir}/murphy/dbus
 %{_libdir}/libmurphy-libdbus.so
 %{_libdir}/libmurphy-dbus-libdbus.so
 %{_libdir}/pkgconfig/murphy-libdbus.pc
@@ -702,11 +593,6 @@ ldconfig
 %{_bindir}/murphy-console
 %manifest murphy.manifest
 
-%files ivi-resource-manager
-%defattr(-,root,root,-)
-%{_libdir}/murphy/plugins/plugin-ivi-resource-manager.so
-%manifest murphy.manifest
-
 %if %{with icosyscon}
 %files system-controller
 %defattr(-,root,root,-)
index 7eb8c18..185daf0 100644 (file)
@@ -15,6 +15,7 @@ BuildRequires:  pkgconfig(libebook-contacts-1.2)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(aul)
 
 %description
 A service to export OFono/Obex functionality over DBUS, to be used by WebRuntime plugin
@@ -37,7 +38,7 @@ export LDFLAGS="${LDFLAGS} -Wl,--rpath=%{PREFIX} -Wl,--as-needed"
 rm -rf %{buildroot}
 %make_install
 
-%install_service ../user/weston.target.wants phoned.service
+%install_service ../user/default.target.wants phoned.service
 
 %files
 %manifest %{name}.manifest
@@ -45,4 +46,4 @@ rm -rf %{buildroot}
 %{_prefix}/bin/phoned
 %{_prefix}/share/dbus-1/services/org.tizen.phone.service
 %{_unitdir_user}/phoned.service
-%{_unitdir_user}/weston.target.wants/phoned.service
+%{_unitdir_user}/default.target.wants/phoned.service
index 4989fe5..4694999 100644 (file)
@@ -124,6 +124,16 @@ Group: System Environment/Configuration
 %description config
 Default configuration for PulseAudio.
 
+%package cascaded-setup
+Summary: Configuration for enabling the "cascaded" PulseAudio setup
+Group: Multimedia/Audio
+
+%description cascaded-setup
+This package enables the system PulseAudio instance, and changes the user
+instance configuration so that user instances access the hardware via the
+system instance instead of accessing the hardware directly. This allows
+multiple users to use the hardware simultaneously.
+
 %package module-raop
 Summary: PA module-raop
 Group:   Multimedia/Audio
@@ -297,6 +307,29 @@ setcap cap_sys_nice+ep /usr/bin/pulseaudio
 %postun realtime-scheduling
 setcap -r /usr/bin/pulseaudio
 
+%post cascaded-setup
+# TODO: Check if there's a macro in Tizen for doing this.
+if [ $1 -eq 1 ] ; then
+        # Initial installation
+        systemctl preset pulseaudio.service >/dev/null 2>&1 || :
+fi
+
+%preun cascaded-setup
+# TODO: Check if there's a macro in Tizen for doing this.
+if [ $1 -eq 0 ] ; then
+        # Package removal, not upgrade
+        systemctl --no-reload disable pulseaudio.service >/dev/null 2>&1 || :
+        systemctl stop pulseaudio.service >/dev/null 2>&1 || :
+fi
+
+%postun cascaded-setup
+# TODO: Check if there's a macro in Tizen for doing this.
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+        # Package upgrade, not uninstall
+        systemctl try-restart pulseaudio.service >/dev/null 2>&1 || :
+fi
+
 %lang_package
 
 %files
@@ -313,17 +346,20 @@ setcap -r /usr/bin/pulseaudio
 # list all modules
 %{_libdir}/pulse-%{version}/modules/libalsa-util.so
 %{_libdir}/pulse-%{version}/modules/libcli.so
+%{_libdir}/pulse-%{version}/modules/liblogind.so
 %{_libdir}/pulse-%{version}/modules/libprotocol-cli.so
 %{_libdir}/pulse-%{version}/modules/libprotocol-http.so
 %{_libdir}/pulse-%{version}/modules/libprotocol-native.so
 %{_libdir}/pulse-%{version}/modules/libprotocol-simple.so
 %{_libdir}/pulse-%{version}/modules/librtp.so
+%{_libdir}/pulse-%{version}/modules/libtunnel-manager.so
 %{_libdir}/pulse-%{version}/modules/module-alsa-sink.so
 %{_libdir}/pulse-%{version}/modules/module-alsa-source.so
 %{_libdir}/pulse-%{version}/modules/module-always-sink.so
 %{_libdir}/pulse-%{version}/modules/module-console-kit.so
 %{_libdir}/pulse-%{version}/modules/module-device-restore.so
 %{_libdir}/pulse-%{version}/modules/module-stream-restore.so
+%{_libdir}/pulse-%{version}/modules/module-tunnel-manager.so
 %{_libdir}/pulse-%{version}/modules/module-cli-protocol-tcp.so
 %{_libdir}/pulse-%{version}/modules/module-cli-protocol-unix.so
 %{_libdir}/pulse-%{version}/modules/module-cli.so
@@ -488,6 +524,12 @@ setcap -r /usr/bin/pulseaudio
 %{_datadir}/pulseaudio/alsa-mixer/paths/*
 %{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
 
+%files cascaded-setup
+%config(noreplace) %{_sysconfdir}/pulse/cascaded.pa
+%config(noreplace) %{_sysconfdir}/pulse/tunnel-manager.conf
+%{_libdir}/systemd/system/pulseaudio.service
+%{_libdir}/systemd/system/pulseaudio.socket
+
 %files module-devel
 %manifest %{name}.manifest
 %defattr(-,root,root)
index 4387171..b7f26fe 100644 (file)
@@ -50,8 +50,8 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 %install
 %make_install
-mkdir -p %{buildroot}%{_sysconfdir}
-cp -f script/make_info_file.sh %{buildroot}%{_sysconfdir}/make_info_file.sh
+mkdir -p %{buildroot}%{_bindir}
+cp -f script/make_info_file.sh %{buildroot}%{_bindir}/make_info_file.sh
 
 %post -p /sbin/ldconfig
 
@@ -61,7 +61,7 @@ cp -f script/make_info_file.sh %{buildroot}%{_sysconfdir}/make_info_file.sh
 %manifest %{name}.manifest
 %license LICENSE.APLv2
 %{_libdir}/libcapi-system-info.so.*
-%attr(0744,root,-) %{_sysconfdir}/make_info_file.sh
+%attr(0744,root,-) %{_bindir}/make_info_file.sh
 
 %files devel
 %manifest %{name}.manifest
diff --git a/proto-meta-Tizen_generic/specfile-initial/tlm/packaging/tlm.spec b/proto-meta-Tizen_generic/specfile-initial/tlm/packaging/tlm.spec
new file mode 100644 (file)
index 0000000..a2e4fad
--- /dev/null
@@ -0,0 +1,418 @@
+# enable debug features such as control environment variables
+# WARNING! do not use for production builds as it will break security
+%define debug_build 0
+%define efl 0
+
+%if %{debug_build} == 1
+%define extra_config_options1 --enable-gtk-doc --enable-debug
+%endif
+
+%if %{efl} == 1
+%define extra_config_options1 --enable-examples
+%endif
+
+
+Name:    tlm
+Summary: Login manager for Tizen
+Version: 1.0.3
+Release: 0
+Group:   System/Service
+License: LGPL-2.1+
+URL:     https://github.com/01org/tlm
+Source:     %{name}-%{version}.tar.gz
+Source1001: %{name}.manifest
+Requires(post): /sbin/ldconfig
+Requires(post): systemd
+Requires(postun): /sbin/ldconfig
+Requires(postun): systemd
+Requires: gumd
+Requires: libsystemd
+BuildRequires: pkgconfig(glib-2.0) >= 2.30
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(gmodule-2.0)
+BuildRequires: pkgconfig(libgum)
+BuildRequires: pam-devel
+%if %{debug_build} == 1
+BuildRequires: gtk-doc
+%endif
+%if %{efl} == 1
+BuildRequires: pkgconfig(elementary)
+%endif
+
+%description
+TLM is a daemon that handles user logins in a multi-user, multi-seat system by
+authenticating the users through PAM, and setting up, launching, and tracking
+user sessions.
+
+%package devel
+Summary:    Dev files for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description devel
+Development files for %{name}.
+
+
+%package doc
+Summary:    Doc files for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description doc
+Documentation files for %{name}.
+
+
+%if "%{profile}" != "ivi"
+
+%package config-common
+Summary:    Configuration files for common-profile
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Provides:   %{name}-config
+
+%description config-common
+Tizen Login Manager configuration files for common-profile.
+
+%else
+
+%package config-ivi-singleseat
+Summary:    Configuration files for ivi-profile with single seat
+Group:     System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   weekeyboard
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-modello, %{name}-config-ivi-singleseat-ico
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
+
+%description config-ivi-singleseat
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat.
+
+
+%package config-ivi-singleseat-modello
+Summary:    Configuration files for ivi-profile with single seat for modello
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   Modello-Installer-xwalk
+Requires:   weekeyboard
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-ico
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
+
+%description config-ivi-singleseat-modello
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat for modello.
+
+
+%package config-ivi-singleseat-ico
+Summary:    Configuration files for ivi-profile with single seat for ico
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   ico-uxf-homescreen
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+
+%description config-ivi-singleseat-ico
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat for ico.
+
+
+%package config-ivi-multiseat
+Summary:    Configuration files for ivi-profile with multi seat
+Group:     System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   weekeyboard
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
+Conflicts:  ico-uxf-weston-plugin
+
+%description config-ivi-multiseat
+Generic Tizen Login Manager configuration files for ivi-profile with
+multi seat.
+
+
+%package config-ivi-vtc1010
+Summary:    Configuration files for ivi-profile on VTC-1010
+Group:      System/Service
+Requires:   weekeyboard
+Requires:   %{name} = %{version}-%{release}
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
+Conflicts:  ico-uxf-weston-plugin
+
+%description config-ivi-vtc1010
+Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
+
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
+
+
+%build
+%if %{debug_build} == 1
+./autogen.sh
+%endif
+%reconfigure --enable-gum \
+             %{?extra_config_options1:%extra_config_options1} \
+             %{?extra_config_options2:%extra_config_options2}
+%__make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+%make_install
+rm -f %{buildroot}%{_sysconfdir}/tlm.conf
+install -m 755 -d %{buildroot}%{_unitdir}
+install -m 644 data/tlm.service %{buildroot}%{_unitdir}
+install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
+install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/
+install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/
+install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
+%if "%{profile}" == "ivi"
+install -m 755 -d %{buildroot}%{_sysconfdir}/xdg/weston
+install -m 644 data/tizen-ivi/etc/tlm*.conf %{buildroot}%{_sysconfdir}
+install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
+install -m 644 data/tizen-ivi/etc/xdg/weston/*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
+install -m 755 -d %{buildroot}%{_sysconfdir}/udev/rules.d
+install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/profile.d
+install -m 644 data/tizen-ivi/etc/profile.d/* %{buildroot}%{_sysconfdir}/profile.d/
+%else
+install -m 644 data/tizen-common/etc/tlm.conf %{buildroot}%{_sysconfdir}
+install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
+%endif
+
+
+%post
+/sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%if "%{profile}" != "ivi"
+
+%post config-common
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-common
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-common
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+%else
+
+%post config-ivi-singleseat
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-singleseat-modello
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-modello.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat-modello
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat-modello
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-singleseat-ico
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-ico.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat-ico
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat-ico
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-multiseat
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-multiseat.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-multiseat
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-multiseat
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-vtc1010
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-vtc1010.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-vtc1010
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-vtc1010
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+%endif
+
+
+%files
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%license COPYING
+%doc AUTHORS NEWS README
+%{_bindir}/%{name}
+%{_bindir}/%{name}-sessiond
+%{_bindir}/%{name}-client
+%{_bindir}/%{name}-launcher
+%{_libdir}/lib%{name}*.so.*
+%{_libdir}/%{name}/plugins/*.so*
+%{_unitdir}/tlm.service
+%config %{_sysconfdir}/pam.d/tlm-login
+%config %{_sysconfdir}/pam.d/tlm-default-login
+%config %{_sysconfdir}/pam.d/tlm-system-login
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/%{name}/*.h
+%{_libdir}/lib%{name}*.so
+%{_libdir}/pkgconfig/%{name}.pc
+%if %{efl} == 1
+%{_bindir}/tlm-ui
+%endif
+
+
+%files doc
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/tlm/*
+
+
+%if "%{profile}" != "ivi"
+
+%files config-common
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm.conf
+%config(noreplace) %{_sysconfdir}/session.d/*
+
+%else
+
+%files config-ivi-singleseat
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
+%config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-singleseat-modello
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-modello.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-singleseat-ico
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat-ico.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-multiseat
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-multiseat.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-multiseat
+%config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-vtc1010
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-vtc1010.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-vtc1010
+%config(noreplace) %{_sysconfdir}/session.d/user-session
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+%endif
+
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
deleted file mode 100644 (file)
index 5ef8985..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-%bcond_with x
-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}
-BuildRequires:  xorg-launch-helper
-%endif
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pam-devel
-BuildRequires:  pkgconfig(libsystemd-login)
-
-%description
-Systemd user session units.
-
-%package gnome
-Summary:        Gnome user session units
-Group:          System/Configuration
-Requires:       user-session-units
-
-%description gnome
-Gnome user session units package.
-
-%package enlightenment
-Summary:        Enlightenment user session units
-Group:          System/Configuration
-Requires:       user-session-units
-
-%description enlightenment
-Enlightenment user session units package.
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-%build
-%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
-%{_bindir}/user-session-launch
-%{_unitdir}/*
-%exclude %{_unitdir_user}/dbus.socket
-%exclude %{_unitdir_user}/dbus.service
-%config %{_sysconfdir}/pam.d/user-session
-
-%files enlightenment
-%manifest %{name}.manifest
-%{_unitdir_user}/e17.target
-%{_unitdir_user}/enlightenment.service
-%{_unitdir_user}/e17.target.wants/enlightenment.service
-
-%files gnome
-%manifest %{name}.manifest
-%{_unitdir_user}/gnome.target
-%{_unitdir_user}/gnome-session.service
-%{_unitdir_user}/gnome.target.wants/gnome-session.service