update specfile initial
authorRonan Le Martret <ronan@fridu.net>
Wed, 17 Sep 2014 08:59:57 +0000 (10:59 +0200)
committerRonan Le Martret <ronan@fridu.net>
Wed, 17 Sep 2014 08:59:57 +0000 (10:59 +0200)
Change-Id: I68ea1918a444666996e6e3cff13ce36a63fe6abc
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
37 files changed:
proto-meta-Tizen_generic/specfile-initial/adns/packaging/adns.spec
proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
proto-meta-Tizen_generic/specfile-initial/alarm-manager/packaging/alarm-manager.spec
proto-meta-Tizen_generic/specfile-initial/app-core/packaging/app-core.spec
proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec
proto-meta-Tizen_generic/specfile-initial/automotive-message-broker/packaging/automotive-message-broker.spec
proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
proto-meta-Tizen_generic/specfile-initial/dlt-daemon/packaging/dlt-daemon.spec
proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
proto-meta-Tizen_generic/specfile-initial/festival/packaging/festival.spec
proto-meta-Tizen_generic/specfile-initial/genivi-audio-manager/packaging/genivi-audio-manager.spec
proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen-sample-apps/packaging/ico-uxf-homescreen-sample-apps.spec
proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec
proto-meta-Tizen_generic/specfile-initial/ico-uxf-weston-plugin/packaging/ico-uxf-weston-plugin.spec
proto-meta-Tizen_generic/specfile-initial/libgsignon-glib/packaging/libgsignon-glib.spec
proto-meta-Tizen_generic/specfile-initial/libhangul/packaging/libhangul.spec
proto-meta-Tizen_generic/specfile-initial/libmm-common/packaging/libmm-common.spec
proto-meta-Tizen_generic/specfile-initial/libmm-fileinfo/packaging/libmm-fileinfo.spec
proto-meta-Tizen_generic/specfile-initial/libmm-sound/packaging/libmm-sound.spec
proto-meta-Tizen_generic/specfile-initial/libmm-utility/packaging/libmm-utility.spec
proto-meta-Tizen_generic/specfile-initial/libprivilege-control/packaging/libprivilege-control.spec
proto-meta-Tizen_generic/specfile-initial/libtbm/packaging/libtbm.spec
proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec
proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
proto-meta-Tizen_generic/specfile-initial/package-manager/packaging/capi-appfw-package-manager.spec
proto-meta-Tizen_generic/specfile-initial/phoned/packaging/phoned.spec
proto-meta-Tizen_generic/specfile-initial/pulseaudio-module-murphy-ivi/packaging/pulseaudio-module-murphy-ivi.spec
proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
proto-meta-Tizen_generic/specfile-initial/sphinxbase/packaging/sphinxbase.spec
proto-meta-Tizen_generic/specfile-initial/system-info/packaging/capi-system-info.spec
proto-meta-Tizen_generic/specfile-initial/system-server/packaging/system-server.spec [new file with mode: 0755]
proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec
proto-meta-Tizen_generic/specfile-initial/update-desktop-files/packaging/update-desktop-files.spec
proto-meta-Tizen_generic/specfile-initial/wayland-ivi-extension/packaging/genivi-shell.spec
proto-meta-Tizen_generic/specfile-initial/weston-ivi-shell/packaging/weston-ivi-shell.spec

index b6e323d..96c6658 100644 (file)
@@ -1,14 +1,14 @@
 Name:           adns
-%define lname  libadns
+%define lname   libadns
 Version:        1.4
 Release:        0
 License:        GPL-2.0+
 Summary:        Advanced Easy-to-Use Asynchronous-Capable DNS Utilities
 Url:            http://www.chiark.greenend.org.uk/~ian/adns/
-Group:          Productivity/Networking/DNS/Utilities
+Group:          System/Utilities
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
-Source1001:    adns.manifest
+Source1001:     adns.manifest
 BuildRequires:  autoconf
 
 %description
@@ -24,7 +24,7 @@ client library for C (and C++) programs.
 
 %package -n libadns-devel
 Summary:        Libraries and header files to develop programs with libadns support
-Group:          Development/Languages/C and C++
+Group:          System/Libraries
 Requires:       %lname = %{version}
 Requires:       glibc-devel
 
@@ -37,13 +37,15 @@ programs with libads support.
 cp %{SOURCE1001} .
 
 %build
-autoreconf -fiv
-%configure
-make %{?_smp_mflags} all
+%reconfigure
+%__make %{?_smp_mflags} all
 
 %install
 %make_install
 
+%post -n %lname -p /sbin/ldconfig
+
+%postun -n %lname -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
@@ -61,9 +63,3 @@ make %{?_smp_mflags} all
 %defattr(-,root,root)
 %{_includedir}/adns.h
 %{_libdir}/libadns.so
-
-%post -n %lname -p /sbin/ldconfig
-
-%postun -n %lname -p /sbin/ldconfig
-
-%changelog
index 6f1dd8f..e124478 100755 (executable)
@@ -106,6 +106,7 @@ fi
 %{_bindir}/ail_fota
 %{_bindir}/ail_desktop
 %{_bindir}/ail_filter
+%{_bindir}/ail_list
 %{_bindir}/ail_package
 %{_datadir}/install-info/*
 %{_libdir}/libail.so.0
index 021815f..4713f6d 100644 (file)
@@ -75,10 +75,6 @@ install -m0644  %{SOURCE102} %{buildroot}%{_sysconfdir}/udev/rules.d/
 
 mkdir -p %{buildroot}/%{_sysconfdir}/dbus-1/system.d
 install -m0644  %{SOURCE103} %{buildroot}%{_sysconfdir}/dbus-1/system.d/
-mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE %{buildroot}%{_datadir}/license/alarm-server
-cp LICENSE %{buildroot}%{_datadir}/license/libalarm
-cp LICENSE %{buildroot}%{_datadir}/license/libalarm-devel
 
 %preun -n alarm-server
 if [ $1 == 0 ]; then
@@ -108,13 +104,12 @@ fi
 %attr(0755,root,root) %{_bindir}/alarm-server
 %{_unitdir}/multi-user.target.wants/alarm-server.service
 %{_unitdir}/alarm-server.service
-%{_sysconfdir}/dbus-1/system.d/alarm-service.conf
+%config %{_sysconfdir}/dbus-1/system.d/alarm-service.conf
 %ifarch %{arm}
- %exclude %{_sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules
+ %exclude %config %{_sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules
 %else
- %{_sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules
+ %config %{_sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules
 %endif
-%{_datadir}/license/alarm-server
 
 %post -n libalarm -p /sbin/ldconfig
 
@@ -125,11 +120,10 @@ fi
 %license LICENSE
 %attr(0644,root,root) %{_libdir}/libalarm.so.0.0.0
 %{_libdir}/libalarm.so.0
-%{_datadir}/license/libalarm
 
 %files -n libalarm-devel
 %manifest %{name}.manifest
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libalarm.so
-%{_datadir}/license/libalarm-devel
+
index 4dcd3a7..8c24e65 100644 (file)
@@ -8,10 +8,12 @@ Release:        0
 Group:          Application Framework/Libraries
 License:        Apache-2.0
 Source0:        app-core-%{version}.tar.gz
-%if %{with wayland} && !%{with x}
+%if %{with wayland}
 Source101:      packaging/core-efl-wayland.target
 %else
 Source101:      packaging/core-efl-x.target
+%endif
+%if %{with x}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(ecore-x)
 %endif
@@ -71,7 +73,7 @@ Requires:   pkgconfig(vconf)
 Requires:   pkgconfig(elementary)
 Requires:   pkgconfig(aul)
 %if %{with x}
-Requires:  pkgconfig(x11)
+Requires:   pkgconfig(x11)
 %endif
 
 %description common-devel
@@ -94,9 +96,12 @@ cp %{SOURCE1001} .
 %build
 
 %cmake . \
-%if %{with wayland} && !%{with x}
+%if %{with wayland}
 -Dwith_wayland=TRUE\
 %endif
+%if %{with x}
+-Dwith_x11=TRUE\
+%endif
 -DENABLE_GTK=OFF
 
 make %{?jobs:-j%jobs}
index f3264a8..ae9b46a 100644 (file)
@@ -1,5 +1,3 @@
-%bcond_with wayland
-%bcond_with x
 Name:       aul
 Summary:    App utility library
 Version:    0.0.300
@@ -21,7 +19,6 @@ Requires(preun): /usr/bin/systemctl
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(ail)
@@ -30,15 +27,6 @@ BuildRequires:  pkgconfig(libprivilege-control)
 BuildRequires:  pkgconfig(app-checker)
 BuildRequires:  pkgconfig(app-checker-server)
 BuildRequires:  pkgconfig(rua)
-%if %{with wayland}
-BuildRequires:  pkgconfig(ecore-wayland)
-%endif
-%if %{with x}
-BuildRequires:  pkgconfig(ecore-x)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(utilX)
-%endif
-BuildRequires:  pkgconfig(ecore-input)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  libattr-devel
@@ -67,12 +55,7 @@ cp %{SOURCE1001} .
 CFLAGS="%{optflags} -D__emul__"; export CFLAGS
 %endif
 
-%cmake . \
-%if %{with wayland}
- -DWITH_WAYLAND=On \
-%else
- -DWITH_WAYLAND=Off \
-%endif
+%cmake .
 
 make %{?jobs:-j%jobs}
 
index acf0914..62d1013 100644 (file)
@@ -2,7 +2,7 @@
 
 Name:       automotive-message-broker
 Summary:    Automotive Message Broker is a vehicle network abstraction system
-Version:    0.11.810
+Version:    0.11.900
 Release:    0
 Group:      Automotive/Service
 License:    LGPL-2.1
@@ -196,7 +196,9 @@ CAN frames listener plug-in for the AMB CAN Simulator package
        -Dtest_plugin=ON \
        -Dgpsnmea_plugin=ON \
        -Dcangen_plugin=ON \
-       -Dcansim_plugin=ON
+       -Dcansim_plugin=ON \
+       -Denable_docs=ON
+
 
 %__make %{?jobs:-j%jobs}
 
@@ -306,7 +308,7 @@ cp packaging.in/config.tizen %{buildroot}%{_sysconfdir}/ambd/
 %files doc
 %defattr(-,root,root,-)
 %manifest packaging.in/amb.manifest.plugins
-%doc %{_docdir}/%{name}/*.txt
+%doc %{_docdir}/%{name}/*
 
 %files plugins-test
 %defattr(-,root,root,-)
index 11aaa5f..0701570 100644 (file)
@@ -12,7 +12,7 @@
 
 
 Name:           crosswalk
-Version:        8.36.161.0
+Version:        9.37.193.0
 Release:        0
 Summary:        Crosswalk is an app runtime based on Chromium
 License:        (BSD-3-Clause and LGPL-2.1+)
@@ -27,7 +27,6 @@ Source1002:     %{name}.xml.in
 Source1003:     %{name}.png
 Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
 Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
-##Patch11:        crosswalk-tizen-ozonewl-xdgshell150.patch
 
 BuildRequires:  bison
 BuildRequires:  bzip2-devel
@@ -43,6 +42,7 @@ BuildRequires:  python
 BuildRequires:  python-xml
 BuildRequires:  perl
 BuildRequires:  which
+BuildRequires:  pkgconfig(ail)
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(appcore-common)
 BuildRequires:  pkgconfig(cairo)
@@ -90,17 +90,15 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(xkbcommon)
-%else
-BuildRequires:  pkgconfig(scim)
 %endif
 
 %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).
 
-%define _manifestdir /usr/share/packages
-%define _manifestdir_ro /opt/share/packages
-%define _desktop_icondir /usr/share/icons/default/small
-%define _desktop_icondir_ro /opt/share/icons/default/small
+%define _manifestdir %TZ_SYS_RO_PACKAGES
+%define _manifestdir_ro %TZ_SYS_RO_PACKAGE
+%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
 
@@ -127,8 +125,6 @@ cp -a src/xwalk/LICENSE LICENSE.xwalk
 %patch10
 %endif
 
-##%patch11
-
 %build
 
 # For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in
@@ -165,7 +161,7 @@ if [ -n "${BUILDDIR_NAME}" ]; then
 fi
 
 %if %{with wayland}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=0"
 %endif
 
 # Force gold binary from chroot ld.gold provided by binutils-gold
@@ -174,6 +170,16 @@ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl} -Dlinux_use_
 # Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
 
+# Temporarily disable Alsa support while snd_seq_* support is not enabled on
+# Tizen. See https://codereview.chromium.org/264973012 and
+# https://review.tizen.org/gerrit/#/c/24336/
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_alsa=0"
+
+# Temporarily disable WebRTC support because its build currently hardcodes
+# dependencies on X11 and OpenSSL. We are still trying to get some
+# clarifications as to whether this is really necessary. See XWALK-2160.
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_webrtc=0"
+
 # 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
@@ -206,13 +212,13 @@ ${GYP_EXTRA_FLAGS} \
 -Duse_system_libexif=1 \
 -Duse_system_libxml=1 \
 -Duse_system_nspr=1 \
+-Dshared_process_mode=1 \
 -Denable_hidpi=1
 
 ninja %{?_smp_mflags} -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper
 
 %install
 # Binaries.
-install -p -D xwalk %{buildroot}%{_bindir}/xwalk
 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
@@ -249,7 +255,6 @@ mkdir -p %{_manifestdir_ro}
 %files
 %manifest %{name}.manifest
 %license AUTHORS.chromium LICENSE.chromium LICENSE.xwalk
-%{_bindir}/xwalk
 %{_bindir}/xwalkctl
 %{_bindir}/xwalk-launcher
 %{_bindir}/xwalk-pkg-helper
index 65cba49..eea37e9 100644 (file)
@@ -54,8 +54,8 @@ Files needed for developing against the Automotive DLT
 mkdir -p build
 cd build
 
-cmake -DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \
-      -DWITH_MAN=OFF -DWITH_DLT_EXAMPLES=OFF ..
+%cmake -DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \
+       -DWITH_MAN=OFF -DWITH_DLT_EXAMPLES=OFF ..
 make %{?_smp_mflags}
 
 %install
index 73828b9..731506a 100644 (file)
@@ -543,8 +543,15 @@ rm -rf %{buildroot}%{_libdir}/ecore/system/upower
 
 %if %{with wayland}
 f="/etc/profile.d/ecore.sh"
-grep EFL_WAYLAND_USE_XDG_SHELL "$f" 2>/dev/null \
+grep --silent EFL_WAYLAND_USE_XDG_SHELL "$f" \
     || printf "\nEFL_WAYLAND_USE_XDG_SHELL='defined'\nexport EFL_WAYLAND_USE_XDG_SHELL\n" >> "$f"
+
+grep --silent ECORE_EVAS_ENGINE "$f" \
+    || printf "\nECORE_EVAS_ENGINE=wayland_shm\n[ ! -d /dev/dri ] || ECORE_EVAS_ENGINE=wayland_egl\nexport ECORE_EVAS_ENGINE" >> "$f"
+
+grep --silent ECORE_IMF_MODULE "$f" \
+    || printf "\nECORE_IMF_MODULE=wayland\nexport ECORE_IMF_MODULE\n" >> "$f"
+
 %endif
 
 %postun -n ecore -p /sbin/ldconfig
index 5c11d68..ce3d17d 100644 (file)
@@ -91,9 +91,9 @@ cp %{SOURCE1001} .
          --disable-ecore-x \
 %endif
 %if %dbus_unavailable
-         --disable-build-examples 
+         --disable-build-examples
 %else
-         --enable-build-examples 
+         --enable-build-examples
 %endif
 
 %__make %{?_smp_mflags}
index 50067f1..e2a9e90 100644 (file)
@@ -1,8 +1,8 @@
 Name:       festival
 Version:    2.1
-Release:    2
+Release:    0
 Group:      System/Libraries
-License:    MIT and GPL+ and TCL
+License:    MIT and GPL-2.0+ and TCL
 Url:        http://www.cstr.ed.ac.uk/projects/festival/
 Summary:    A free speech synthesis and text-to-speech system
 Source0:    festival-%{version}.tar.gz
@@ -64,7 +64,6 @@ cd ../speech_tools
 %patch102
 %patch103 -p1
 %patch104 -p1
-
 %patch200 -p2 -b .shared-build
 %patch201 -p2 -b .bettersoname
 %patch205 -p2 -b .shared
@@ -76,26 +75,25 @@ cd ../speech_tools
 
 %build
 # festival
-%configure --prefix=%_prefix \
-           --libdir=%_libdir \
-           --datadir=%_datadir/festival \
-           --sysconfdir=%_sysconfdir
+%configure --prefix=%{_prefix} \
+           --libdir=%{_libdir} \
+           --datadir=%{_datadir}/festival \
+           --sysconfdir=%{_sysconfdir}
 
 cd ..
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/speech_tools/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/festival-2.1/src/lib
-
 # speech tools
 cd speech_tools
-%configure --prefix=%_prefix \
-            --libdir=%_libdir \
-               --datadir=%_datadir/festival \
-            --sysconfdir=%_sysconfdir
+%_configure --prefix=%{_prefix} \
+            --libdir=%{_libdir} \
+            --datadir=%{_datadir}/festival \
+            --sysconfdir=%{_sysconfdir}
 
-make CC="gcc -fPIC $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
+%__make CC="%__cc -fPIC $RPM_OPT_FLAGS" CXX="%__cxx $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
 cd ../%{name}-%{version}
-make CC="gcc -fPIC $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
-make doc
+%__make CC="%__cc -fPIC $RPM_OPT_FLAGS" CXX="%__cxx $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
+%__make doc
 
 
 %install
@@ -103,70 +101,70 @@ cd ..
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/speech_tools/lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/festival-2.1/src/lib
 cd -
-#%make_install
-#make INSTALLED_BIN=$RPM_BUILD_ROOT%{_bindir} make_installed_bin_shared
+#%%make_install
+#make INSTALLED_BIN=%%{buildroot}%%{_bindir} make_installed_bin_shared
 cd ../speech_tools
 %make_install
 cd ../%{name}-%{version}
 # install binarys
-install -D bin/text2wave $RPM_BUILD_ROOT%_bindir/text2wave
-install -m 755 src/main/festival $RPM_BUILD_ROOT%_bindir/
-install -m 755 src/main/festival_client $RPM_BUILD_ROOT%_bindir/
-install -m 755 bin/festival_server* $RPM_BUILD_ROOT%_bindir/
-install -m 755 examples/saytime $RPM_BUILD_ROOT%_bindir/
+install -D bin/text2wave %{buildroot}%{_bindir}/text2wave
+install -m 755 src/main/festival %{buildroot}%{_bindir}/
+install -m 755 src/main/festival_client %{buildroot}%{_bindir}/
+install -m 755 bin/festival_server* %{buildroot}%{_bindir}/
+install -m 755 examples/saytime %{buildroot}%{_bindir}/
 # install manpages
-install -D -m 644 doc/festival.1 $RPM_BUILD_ROOT%_mandir/man1/festival.1
-install -m 644 doc/festival_client.1 $RPM_BUILD_ROOT%_mandir/man1/
-install -m 644 doc/text2wave.1 $RPM_BUILD_ROOT%_mandir/man1/
+install -D -m 644 doc/festival.1 %{buildroot}%{_mandir}/man1/festival.1
+install -m 644 doc/festival_client.1 %{buildroot}%{_mandir}/man1/
+install -m 644 doc/text2wave.1 %{buildroot}%{_mandir}/man1/
 # install configs
-install -D lib/festival.scm $RPM_BUILD_ROOT%_sysconfdir/festival.scm
+install -D lib/festival.scm %{buildroot}%{_sysconfdir}/festival.scm
 # install dictionarys
-install -D lib/dicts/cmu/cmudict-0.4.out $RPM_BUILD_ROOT%_datadir/%name/dicts/cmu/cmudict-0.4.out
-install -m 644 lib/dicts/cmu/*.scm $RPM_BUILD_ROOT%_datadir/%name/dicts/cmu/
-install -m 644 lib/dicts/wsj.wp39.poslexR $RPM_BUILD_ROOT%_datadir/%name/dicts/
-install -m 644 lib/dicts/wsj.wp39.tri.ngrambin $RPM_BUILD_ROOT%_datadir/%name/dicts/
+install -D lib/dicts/cmu/cmudict-0.4.out %{buildroot}%{_datadir}/%name/dicts/cmu/cmudict-0.4.out
+install -m 644 lib/dicts/cmu/*.scm %{buildroot}%{_datadir}/%name/dicts/cmu/
+install -m 644 lib/dicts/wsj.wp39.poslexR %{buildroot}%{_datadir}/%name/dicts/
+install -m 644 lib/dicts/wsj.wp39.tri.ngrambin %{buildroot}%{_datadir}/%name/dicts/
 # install voices
-mkdir -p $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/festvox
-mkdir -p $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/group
-cp lib/voices/english/kal_diphone/group/* $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/group/
-cp lib/voices/english/kal_diphone/festvox/*.scm $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/festvox
+mkdir -p %{buildroot}%{_datadir}/festival/voices/english/kal_diphone/festvox
+mkdir -p %{buildroot}%{_datadir}/festival/voices/english/kal_diphone/group
+cp lib/voices/english/kal_diphone/group/* %{buildroot}%{_datadir}/festival/voices/english/kal_diphone/group/
+cp lib/voices/english/kal_diphone/festvox/*.scm %{buildroot}%{_datadir}/festival/voices/english/kal_diphone/festvox
 # install data
-cp lib/*.scm $RPM_BUILD_ROOT/usr/share/festival/
-cp lib/*.ngrambin $RPM_BUILD_ROOT/usr/share/festival/
-cp lib/*.gram $RPM_BUILD_ROOT/usr/share/festival/
-cp lib/*.el $RPM_BUILD_ROOT/usr/share/festival/
-install -D lib/etc/unknown_Linux/audsp $RPM_BUILD_ROOT/usr/lib/festival/audsp
+cp lib/*.scm %{buildroot}%{_datadir}/festival/
+cp lib/*.ngrambin %{buildroot}%{_datadir}/festival/
+cp lib/*.gram %{buildroot}%{_datadir}/festival/
+cp lib/*.el %{buildroot}%{_datadir}/festival/
+install -D lib/etc/unknown_Linux/audsp %{buildroot}%{_prefix}/lib/festival/audsp
 # install libs
-install -D src/lib/libFestival.so  $RPM_BUILD_ROOT/%_libdir/libFestival.so
+install -D src/lib/libFestival.so  %{buildroot}/%{_libdir}/libFestival.so
 # install includes
-mkdir -p $RPM_BUILD_ROOT%_includedir/
-install -m 644 src/include/*.h $RPM_BUILD_ROOT%_includedir/
+mkdir -p %{buildroot}%{_includedir}/
+install -m 644 src/include/*.h %{buildroot}%{_includedir}/
 cd ../speech_tools
 # install includes
-mkdir -p $RPM_BUILD_ROOT%_includedir/instantiate
-mkdir -p $RPM_BUILD_ROOT%_includedir/ling_class
-mkdir -p $RPM_BUILD_ROOT%_includedir/rxp
-mkdir -p $RPM_BUILD_ROOT%_includedir/sigpr
-mkdir -p $RPM_BUILD_ROOT%_includedir/unix
-install -m 644 include/*h $RPM_BUILD_ROOT%_includedir
-install -m 644 include/instantiate/*h $RPM_BUILD_ROOT%_includedir/instantiate
-install -m 644 include/ling_class/*h $RPM_BUILD_ROOT%_includedir/ling_class
-install -m 644 include/rxp/*h $RPM_BUILD_ROOT%_includedir/rxp
-install -m 644 include/sigpr/*h $RPM_BUILD_ROOT%_includedir/sigpr
-install -m 644 include/unix/*h $RPM_BUILD_ROOT%_includedir/unix
+mkdir -p %{buildroot}%{_includedir}/instantiate
+mkdir -p %{buildroot}%{_includedir}/ling_class
+mkdir -p %{buildroot}%{_includedir}/rxp
+mkdir -p %{buildroot}%{_includedir}/sigpr
+mkdir -p %{buildroot}%{_includedir}/unix
+install -m 644 include/*h %{buildroot}%{_includedir}
+install -m 644 include/instantiate/*h %{buildroot}%{_includedir}/instantiate
+install -m 644 include/ling_class/*h %{buildroot}%{_includedir}/ling_class
+install -m 644 include/rxp/*h %{buildroot}%{_includedir}/rxp
+install -m 644 include/sigpr/*h %{buildroot}%{_includedir}/sigpr
+install -m 644 include/unix/*h %{buildroot}%{_includedir}/unix
 # make sure we have no static libs, install shared ones
-install -m 644 lib/lib*.so* $RPM_BUILD_ROOT%_libdir
-rm -f $RPM_BUILD_ROOT%_libdir/*.a
+install -m 644 lib/lib*.so* %{buildroot}%{_libdir}
+rm -f %{buildroot}%{_libdir}/*.a
 
 # install init script
-# install -m 755 -D %{S:6} $RPM_BUILD_ROOT/etc/init.d/%name
-# install -d $RPM_BUILD_ROOT%_sbindir
-# ln -sf ../../etc/init.d/%name $RPM_BUILD_ROOT/usr/sbin/rc%name
+# install -m 755 -D %%{S:6} %%{buildroot}/etc/init.d/%%name
+# install -d %%{buildroot}%%_sbindir
+# ln -sf ../../etc/init.d/%%name %%{buildroot}/usr/sbin/rc%%name
 # installl sysconfig file
-#install -m 644 -D %{S:5} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%name
+#install -m 644 -D %%{S:5} %%{buildroot}/var/adm/fillup-templates/sysconfig.%%name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 ldconfig
@@ -182,23 +180,23 @@ ldconfig
 
 %files 
 %defattr(-,root,root)
-%doc COPYING README INSTALL examples/*.text examples/ex1.* examples/*.scm examples/*.dtd
-%_sysconfdir/festival.scm
-#%_sysconfdir/init.d/%name
-%_bindir/festival
-%_bindir/festival_client
-%_bindir/festival_server
-%_bindir/festival_server_control
-%_bindir/text2wave
-%_bindir/saytime
-%_libdir/libe*.so.*
-%_libdir/libFestival.so
-
-%_prefix/lib/festival
-%_datadir/festival
-%_mandir/man1/*
+%license COPYING
+%doc README INSTALL examples/*.text examples/ex1.* examples/*.scm examples/*.dtd
+%{_sysconfdir}/festival.scm
+#%%{_sysconfdir}/init.d/%%name
+%{_bindir}/festival
+%{_bindir}/festival_client
+%{_bindir}/festival_server
+%{_bindir}/festival_server_control
+%{_bindir}/text2wave
+%{_bindir}/saytime
+%{_libdir}/libe*.so.*
+%{_libdir}/libFestival.so
+%{_prefix}/lib/festival
+%{_datadir}/festival
+%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
-%_includedir/*
-%_libdir/libe*.so
+%{_includedir}/*
+%{_libdir}/libe*.so
index 442706b..1a63198 100644 (file)
@@ -12,6 +12,11 @@ BuildRequires:    pkgconfig(sqlite3)
 BuildRequires:    pkgconfig(dbus-1)
 BuildRequires:    pkgconfig(automotive-dlt)
 BuildRequires:    pkgconfig(zlib)
+BuildRequires:   pkgconfig(murphy-common)
+BuildRequires:    pkgconfig(murphy-domain-controller)
+BuildRequires:    pkgconfig(murphy-dbus-libdbus)
+BuildRequires:   bison
+BuildRequires:   flex
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -33,7 +38,7 @@ Requires:   %{name} = %{version}-%{release}
 mkdir -p build
 cd build
 
-cmake -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
+%cmake -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DWITH_DLT=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
 #make VERBOSE=1
 %__make %{?_smp_mflags}
 
@@ -48,10 +53,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/audioManager/routing/libPluginRoutingInterfaceAsync
 %files
 %doc LICENCE README.html
 %{_bindir}/AudioManager
+%{_bindir}/domain-manager
 %{_libdir}/audioManager/command/libPluginCommandInterfaceDbus.so*
 %{_libdir}/audioManager/routing/libPluginRoutingInterfaceDbus.so*
 %{_libdir}/audioManager/control/libPluginControlInterface.so*
 %{_libdir}/audioManager/control/libPluginControlInterfaceDbus.so*
+%{_libdir}/audioManager/control/libPluginControlInterfaceMurphy.so*
 %{_datadir}/audiomanager/*xml
 
 %files devel
index 9e82da0..323870a 100644 (file)
@@ -2,7 +2,7 @@ Name:       ico-uxf-homescreen-sample-apps
 Summary:    HomeScreen sample application
 Version:    0.9.8
 Release:    0
-Group:      System/Utilities
+Group:      Automotive/ICO Homescreen
 License:    Apache-2.0
 URL:        http://www.toyota.com
 Source0:    %{name}-%{version}.tar.bz2
@@ -53,6 +53,7 @@ Requires: ico-uxf-utilities >= 0.9.04
 Requires: ico-vic-amb-plugin >= 0.9.4
 
 #ico-app-miscellaneous
+Requires: genivi-shell
 Requires: weekeyboard
 
 %description
@@ -82,7 +83,7 @@ mkdir -p %{buildroot}%{sound_PREFIX}/res/icons/default/small/
 mkdir -p %{buildroot}%{sound_PREFIX}/res/images/
 install -m 0644 ico-app-soundsample/soundsample_config.txt %{buildroot}%{sound_PREFIX}/res/
 install -m 0644 ico-app-soundsample/sound_bg.png %{buildroot}%{sound_PREFIX}/res/images/
-install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.png %{buildroot}%{sound_PREFIX}/res/icons/default/small/
+install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.png %{buildroot}%{_datadir}/icons/default/small/
 install -m 0644 ico-app-soundsample/musicbox.wav %{buildroot}%{sound_PREFIX}/sounds/
 install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.xml %{buildroot}%{_datadir}/packages/
 
@@ -94,7 +95,7 @@ mkdir -p %{buildroot}%{vic_PREFIX}/res/icons/default/small/
 mkdir -p %{buildroot}%{vic_PREFIX}/res/images/
 install -m 0644 ico-app-vicsample/vicsample_config.txt %{buildroot}%{vic_PREFIX}/res/
 install -m 0644 ico-app-vicsample/vicinfo_bg.png %{buildroot}%{vic_PREFIX}/res/images/
-install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.png %{buildroot}%{vic_PREFIX}/res/icons/default/small/
+install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.png %{buildroot}%{_datadir}/icons/default/small/
 install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.xml %{buildroot}%{_datadir}/packages/
 
 # configurations(ico-app-miscellaneous)
@@ -110,6 +111,12 @@ install -m 0755 ico-app-miscellaneous/browser %{buildroot}%{_bindir}
 # install tizen package metadata for weekeyboard
 install -m 0644 ico-app-miscellaneous/weekeyboard.xml %{buildroot}%{_datadir}/packages/
 
+# install tizen package metadata for mock navigator
+install -m 0644 ico-app-miscellaneous/navigator.xml %{buildroot}%{_datadir}/packages/
+install -m 0644 ico-app-miscellaneous/navigator.png %{buildroot}%{_datadir}/icons/default/small/
+
+
+
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -117,27 +124,29 @@ install -m 0644 ico-app-miscellaneous/weekeyboard.xml %{buildroot}%{_datadir}/pa
 %{sound_PREFIX}/bin/ico-app-soundsample
 %{sound_PREFIX}/res/soundsample_config.txt
 %{sound_PREFIX}/res/images/sound_bg.png
-%{sound_PREFIX}/res/icons/default/small/org.tizen.ico.app-soundsample.png
 %{sound_PREFIX}/sounds/musicbox.wav
+%{_datadir}/icons/default/small/org.tizen.ico.app-soundsample.png
 %{_datadir}/packages/org.tizen.ico.app-soundsample.xml
 
 # files(ico-app-vicsample)
 %{vic_PREFIX}/bin/ico-app-vicsample
 %{vic_PREFIX}/res/vicsample_config.txt
 %{vic_PREFIX}/res/images/vicinfo_bg.png
-%{vic_PREFIX}/res/icons/default/small/org.tizen.ico.app-vicsample.png
-/usr/share/packages/org.tizen.ico.app-vicsample.xml
+%{_datadir}/icons/default/small/org.tizen.ico.app-vicsample.png
+%{_datadir}/packages/org.tizen.ico.app-vicsample.xml
 
 # files(ico-app-miscellaneous)
 %{_bindir}/browser
 %{_datadir}/packages/browser.xml
 %{_datadir}/packages/terminal.xml
+%{_datadir}/packages/navigator.xml
 %{_datadir}/packages/weekeyboard.xml
 %{_datadir}/icons/default/small/browser.png
+%{_datadir}/icons/default/small/navigator.png
 
 %post
 /sbin/ldconfig
-# This icon exists in main weston package so we don't package it in.
+# This icons exists in main weston package so we don't package it in.
 # Create a symbolic link to it instead.
 ln -sf %{_datadir}/weston/terminal.png %{_datadir}/icons/default/small/
 # Update the app database.
@@ -145,6 +154,7 @@ ln -sf %{_datadir}/weston/terminal.png %{_datadir}/icons/default/small/
 %{_bindir}/pkginfo --imd /usr/share/packages/org.tizen.ico.app-vicsample.xml
 %{_bindir}/pkginfo --imd /usr/share/packages/browser.xml
 %{_bindir}/pkginfo --imd /usr/share/packages/terminal.xml
+%{_bindir}/pkginfo --imd /usr/share/packages/navigator.xml
 
 %preun
 # Update the app database.
@@ -152,6 +162,7 @@ ln -sf %{_datadir}/weston/terminal.png %{_datadir}/icons/default/small/
 %{_bindir}/pkginfo --rmd /usr/share/packages/org.tizen.ico.app-vicsample.xml
 %{_bindir}/pkginfo --rmd /usr/share/packages/browser.xml
 %{_bindir}/pkginfo --rmd /usr/share/packages/terminal.xml
+%{_bindir}/pkginfo --rmd /usr/share/packages/navigator.xml
 
 %postun
 /sbin/ldconfig
index dd19e02..a122d9c 100644 (file)
@@ -43,13 +43,32 @@ Requires: weston-ivi-shell
 Requires: genivi-shell
 Requires: ico-uxf-weston-plugin >= 0.9.21
 Requires: ico-uxf-utilities >= 0.9.07
+Requires: system-controller
 
 %description
-Sample homescreen application and system controller daemon
+Sample homescreen application.
+
+
+%package system-controller
+Summary: System controller for ICO HomeScreen
+Group:   Automotive / ICO Homescreen
+Requires: %{name} = %{version}-%{release}
+Requires: weston >= 1.4
+Requires: weston-ivi-shell
+Requires: genivi-shell
+Requires: ico-uxf-weston-plugin >= 0.9.21
+Requires: ico-uxf-utilities >= 0.9.07
+Provides: system-controller
+Conflicts: murphy-system-controller
+
+%description system-controller
+A service to provide the low-level functionality that ICO HomeScreen
+requires.
+
 
 %package system-controller-devel
 Summary:  Development files for %{name}
-Group:    Graphics & UI Framework/Development
+Group:    Automotive / ICO Homescreen
 Requires: %{name} = %{version}-%{release}
 Requires: capi-base-common-devel
 Requires: pkgconfig(eina)
@@ -99,17 +118,17 @@ cp tool/notification/ico_send_notification2 %{buildroot}%{_bindir}
 /sbin/ldconfig
 
 # Update the app database.
-%{_bindir}/pkginfo --imd /usr/share/packages/org.tizen.ico.homescreen.xml
-%{_bindir}/pkginfo --imd /usr/share/packages/org.tizen.ico.statusbar.xml
-%{_bindir}/pkginfo --imd /usr/share/packages/org.tizen.ico.system-controller.xml
-%{_bindir}/pkginfo --imd /usr/share/packages/org.tizen.ico.onscreen.xml
+%{_bindir}/pkginfo --imd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.homescreen.xml
+%{_bindir}/pkginfo --imd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.statusbar.xml
+%{_bindir}/pkginfo --imd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.system-controller.xml
+%{_bindir}/pkginfo --imd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.onscreen.xml
 
 %preun
 # Update the app database.
-%{_bindir}/pkginfo --rmd /usr/share/packages/org.tizen.ico.homescreen.xml
-%{_bindir}/pkginfo --rmd /usr/share/packages/org.tizen.ico.statusbar.xml
-%{_bindir}/pkginfo --rmd /usr/share/packages/org.tizen.ico.system-controller.xml
-%{_bindir}/pkginfo --rmd /usr/share/packages/org.tizen.ico.onscreen.xml
+%{_bindir}/pkginfo --rmd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.homescreen.xml
+%{_bindir}/pkginfo --rmd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.statusbar.xml
+%{_bindir}/pkginfo --rmd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.system-controller.xml
+%{_bindir}/pkginfo --rmd %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.onscreen.xml
 
 %postun
 /sbin/ldconfig
@@ -129,17 +148,25 @@ rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.system-controller.desktop
 %{TZ_SYS_RW_PACKAGES}/org.tizen.ico.onscreen.xml
 %{_libdir}/libico-appfw.*
 %{_libdir}/libico-state-machine.*
-%{TZ_SYS_RW_APP}/org.tizen.ico.system-controller
-%{TZ_SYS_RW_PACKAGES}/org.tizen.ico.system-controller.xml
-%{_libdir}/systemd/user/ico-system-controller.service
-%{_libdir}/systemd/user/ico-uxf-wait-launchpad-ready.path
-%{_libdir}/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
 %{_bindir}/ico_clear_screen
 %{_bindir}/ico_change_loginuser
 %{_bindir}/ico_del_notification
 %{_bindir}/ico_dump_notification
 %{_bindir}/ico_send_notification
 %{_bindir}/ico_send_notification2
+%{_datadir}/icons/default/small/org.tizen.ico.homescreen.png
+%{_datadir}/icons/default/small/org.tizen.ico.statusbar.png
+%{_datadir}/icons/default/small/org.tizen.ico.onscreen.png
+/usr/apps/org.tizen.ico.system-controller/res/config
+
+%files system-controller
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+/usr/share/packages/org.tizen.ico.system-controller.xml
+/usr/lib/systemd/user/ico-uxf-wait-launchpad-ready.path
+/usr/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
+/usr/lib/systemd/user/ico-system-controller.service
+/usr/apps/org.tizen.ico.system-controller/bin
 %attr(644,app,app) /home/app/ico/defaultApps.info
 %attr(755,app,app) /home/app/ico
 
@@ -166,3 +193,4 @@ rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.system-controller.desktop
 %{_includedir}/ico-state-machine/CicoStateCore.h
 %{_includedir}/ico-state-machine/CicoStateMachine.h
 %{_includedir}/ico-state-machine/CicoStateMachineCreator.h
+
index 2e60b00..bbc54a8 100644 (file)
@@ -8,18 +8,18 @@ Group:      Graphics & UI Framework/Automotive UI
 License:    MIT
 Source0:    %{name}-%{version}.tar.bz2
 
-BuildRequires: pkgconfig(weston) >= 1.4.0
+BuildRequires: pkgconfig(weston) >= 1.5.0
 BuildRequires: pkgconfig(pixman-1)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(egl)
 BuildRequires: mesa-devel
-BuildRequires: genivi-shell-devel
-BuildRequires: weston-ivi-shell-devel
-Requires: weston >= 1.4.0
-Requires: genivi-shell
-Requires: weston-ivi-shell
+BuildRequires: genivi-shell-devel >= 0.2.3
+BuildRequires: weston-ivi-shell-devel >= 0.1.7
+Requires: weston >= 1.5.0
+Requires: genivi-shell >= 0.2.3
+Requires: weston-ivi-shell >= 0.1.7
 Requires: weekeyboard
 Conflicts: weston-ivi-config
 Conflicts: weston-ivi-shell-config
index adb4f1d..b9f0eb9 100644 (file)
@@ -12,7 +12,9 @@ Source1:    %{name}.manifest
 URL:        https://01.org/gsso
 Requires: dbus-1
 Requires: gsignon
-Requires(post):   /sbin/ldconfig
+Requires: gsignond-plugin-oauth
+Requires: gsignond-plugin-sasl
+Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(check)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -20,7 +22,7 @@ BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
 
 %description
-%{summary} package
+%{summary} files
 
 %package devel
 Summary:    Development files for %{name}
@@ -28,14 +30,14 @@ Group:      SDK/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-%{summary} package
+%{summary} files
 
 %package doc
 Summary:    Documentation files for %{name}
 Group:      SDK/Documentation
 
 %description doc
-%{summary} package
+%{summary} files
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -57,7 +59,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
 %license COPYING
-%doc AUTHORS ChangeLog INSTALL NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %{_libdir}/%{name}.so.*
 
 %files devel
index 8cf5c2d..6f499f8 100644 (file)
@@ -12,7 +12,7 @@ BuildRequires:  gettext-tools
 
 
 %description
-Hangul input library used by scim-hangul and ibus-hangul
+"Hangul input library used by scim-hangul and ibus-hangul
 
 
 Authors:
@@ -21,7 +21,7 @@ Authors:
     Joon-cheol Park <jooncheol@gmail.com>
 
 Hangul input library used by scim-hangul and ibus-hangul
-
+"
 
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
@@ -38,7 +38,8 @@ to develop applications that require these.
 cp %{SOURCE1001} .
 
 %build
-[ ! -x autogen.sh ] || rm -f configure
+[ ! -x autogen.sh ] ||  rm -f configure 
+touch ChangeLog
 %reconfigure --disable-static --with-pic
 %__make %{?_smp_mflags}
 
@@ -46,6 +47,7 @@ cp %{SOURCE1001} .
 make DESTDIR=${RPM_BUILD_ROOT} install
 rm -f %{buildroot}%{_libdir}/*.la
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -59,7 +61,7 @@ rm -rf %{buildroot}
 %manifest %{name}.manifest
 %defattr(-, root, root)
 %license COPYING
-%doc AUTHORS NEWS README ChangeLog
+%doc AUTHORS NEWS README
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/libhangul/hanja/
 %{_datadir}/libhangul/hanja/hanja.txt
index 9242ee0..678af83 100644 (file)
@@ -1,5 +1,5 @@
 Name:       libmm-common
-Version:    0.2.54
+Version:    0.2.55
 Release:    0
 Summary:    Multimedia Framework Common Library
 Group:      Multimedia/Libraries
@@ -25,7 +25,9 @@ Multimedia Framework Common Library (devel) package.
 cp %{SOURCE1001} .
 
 %build
-CFLAGS="%{optflags} -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" " %reconfigure
+
+CFLAGS="%{optflags} -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
+%reconfigure
 %__make %{?_smp_mflags}
 
 %install
@@ -39,6 +41,7 @@ CFLAGS="%{optflags} -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libmmfcommon.so.*
+%license LICENSE.APLv2
 
 %files devel
 %manifest %{name}.manifest
index 90dd054..d6b559e 100755 (executable)
@@ -5,7 +5,7 @@ Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    libmm-fileinfo.manifest
+Source1001:    libmm-fileinfo.manifest
 BuildRequires: pkgconfig(mm-common)
 BuildRequires: pkgconfig(mm-log)
 BuildRequires: pkgconfig(libswscale)
@@ -24,7 +24,6 @@ BuildRequires: pkgconfig(drm-client)
 %description
 Multimedia Framework FileInfo Library
 
-
 %package devel
 Summary:    Media Fileinfo
 Group:      Development/Libraries
@@ -48,7 +47,7 @@ export CFLAGS
     --disable-iommap \
     --disable-gtk \
 %if %{use_drm}
-    --enable-drm 
+    --enable-drm
 %else
     --disable-drm
 %endif
@@ -57,9 +56,6 @@ export CFLAGS
 
 %install
 %make_install
-mkdir -p %{buildroot}/%{_datadir}/license
-cp -rf %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0 %{buildroot}/%{_datadir}/license/%{name}
-
 
 %post -p /sbin/ldconfig
 
@@ -77,9 +73,10 @@ cp -rf %{_builddir}/%{name}-%{version}/LICENSE.APLv2.0 %{buildroot}/%{_datadir}/
 %{_libdir}/libmmfile_codecs.so
 %{_libdir}/libmmfile_formats.so
 %{_libdir}/libmmfile_utils.so
-%{_datadir}/license/%{name}
+%license LICENSE.APLv2.0
 
 %files devel
 %manifest %{name}.manifest
 %{_includedir}/mmf/mm_file.h
 %{_libdir}/pkgconfig/mm-fileinfo.pc
+
index 6c0c21a..99bf90d 100644 (file)
@@ -10,20 +10,20 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    sound-server.service
 Source2:    sound-server.path
-Source1001:    libmm-sound.manifest
-Requires(post): /sbin/ldconfig
-Requires(post): /usr/bin/vconftool
-Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(mm-common)
-BuildRequires: pkgconfig(avsystem)
-BuildRequires: pkgconfig(mm-log)
-BuildRequires: pkgconfig(mm-session)
-BuildRequires: pkgconfig(audio-session-mgr)
-BuildRequires: pkgconfig(sysman)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(heynoti)
-BuildRequires: pkgconfig(security-server)
+Source1001:         libmm-sound.manifest
+Requires(post):     /sbin/ldconfig
+Requires(post):     /usr/bin/vconftool
+Requires(postun):   /sbin/ldconfig
+BuildRequires:      pkgconfig(mm-common)
+BuildRequires:      pkgconfig(avsystem)
+BuildRequires:      pkgconfig(mm-log)
+BuildRequires:      pkgconfig(mm-session)
+BuildRequires:      pkgconfig(audio-session-mgr)
+BuildRequires:      pkgconfig(sysman)
+BuildRequires:      pkgconfig(glib-2.0)
+BuildRequires:      pkgconfig(vconf)
+BuildRequires:      pkgconfig(heynoti)
+BuildRequires:      pkgconfig(security-server)
 
 %description
 MMSound Package contains client lib and sound_server binary for sound system
@@ -31,7 +31,7 @@ MMSound Package contains client lib and sound_server binary for sound system
 
 %package devel
 Summary: MMSound development package
-Group:      Development/Libraries
+Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -39,7 +39,7 @@ MMSound development package for sound system
 
 %package sdk-devel
 Summary: MMSound development package
-Group:      Development/Libraries
+Group:      System/Libraries
 Requires:   %{name}-devel = %{version}-%{release}
 
 %description sdk-devel
@@ -47,14 +47,13 @@ MMSound development package for sound system
 
 %package tool
 Summary: MMSound utility package - contians mm_sound_testsuite, sound_check
-Group:      TO_BE/FILLED_IN
+Group:      System/Utilities
 Requires:   %{name} = %{version}-%{release}
 
 %description tool
 MMSound utility package - contians mm_sound_testsuite, sound_check for sound system
 
 
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
@@ -75,26 +74,26 @@ CFLAGS="%{optflags} -fvisibility=hidden -DMM_DEBUG_FLAG -DSEPARATE_SPEAKER_AND_W
 CFLAGS="$CFLAGS -DMURPHY"; export CFLAGS
 %endif
 %if %{with pulseaudio_samsung_policy}
-%configure --prefix=/usr --enable-pulse --enable-security --enable-policy
+%reconfigure --prefix=/usr --enable-pulse --enable-security --enable-policy
 %else
-%configure --prefix=/usr --enable-pulse --enable-security
+%reconfigure --prefix=/usr --enable-pulse --enable-security
 %endif
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
+
 
 %install
 %make_install
-install -d %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
-install -m0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/
-install -m0644 %{SOURCE2} %{buildroot}/usr/lib/systemd/system/
-ln -sf ../sound-server.path %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/sound-server.path
+install -d %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants
+install -m0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system/
+install -m0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/system/
+ln -sf ../sound-server.path %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/sound-server.path
 
 # FIXME: remove after systemd is in
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d
-ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S23soundserver
-ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S23soundserver
-
+ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S23soundserver
+ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S23soundserver
 
 
 %post
@@ -131,10 +130,10 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/soundserver
 %{_sysconfdir}/rc.d/rc3.d/S23soundserver
 %{_sysconfdir}/rc.d/rc4.d/S23soundserver
-/usr/share/sounds/sound-server/*
-/usr/lib/systemd/system/multi-user.target.wants/sound-server.path
-/usr/lib/systemd/system/sound-server.service
-/usr/lib/systemd/system/sound-server.path
+%{_prefix}/share/sounds/sound-server/*
+%{_prefix}/lib/systemd/system/multi-user.target.wants/sound-server.path
+%{_prefix}/lib/systemd/system/sound-server.service
+%{_prefix}/lib/systemd/system/sound-server.path
 
 %files devel
 %manifest %{name}.manifest
@@ -146,7 +145,6 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4
 %{_includedir}/mmf/mm_sound_plugin.h
 %{_includedir}/mmf/mm_sound_plugin_hal.h
 
-
 %files sdk-devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
index 3017560..96da689 100644 (file)
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig(mm-ta)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  libjpeg-turbo-devel
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
index c3181de..f3d9cdc 100644 (file)
@@ -47,15 +47,16 @@ export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration"
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DTZ_SYS_DB=%TZ_SYS_DB \
          -DTZ_SYS_HOME=%TZ_SYS_HOME \
-         -DTZ_SYS_ETC=%TZ_SYS_ETC
+         -DTZ_SYS_ETC=%TZ_SYS_ETC \
+         -DSYSTEMD_UNIT_DIR=%{_unitdir}
 
 VERBOSE=1 %__make %{?jobs:-j%jobs}
 
 %install
 %make_install
 mkdir -p %{buildroot}%{_datadir}/privilege-control/
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -sf %{_libdir}/systemd/system/smack-rules.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/smack-rules.service
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+ln -sf %{_unitdir}/smack-rules.service %{buildroot}%{_unitdir}/multi-user.target.wants/smack-rules.service
 mkdir -p %{buildroot}%{TZ_SYS_DB}
 sed -i 's|TZ_SYS_DB|%{TZ_SYS_DB}|g' %{SOURCE1001}
 
@@ -77,10 +78,10 @@ api_feature_loader --verbose --dir=%{_datadir}/privilege-control/
 %{_libdir}/*.so.*
 %{_libdir}/librules-db-sql-udf.so
 #systemd service
-%{_libdir}/systemd/system/smack-rules.service
+%{_unitdir}/smack-rules.service
 %{_bindir}/api_feature_loader
 #link to activate systemd service
-%{_libdir}/systemd/system/multi-user.target.wants/smack-rules.service
+%{_unitdir}/multi-user.target.wants/smack-rules.service
 %{_datadir}/privilege-control/db/rules-db.sql
 %{_datadir}/privilege-control/db/rules-db-data.sql
 %{_datadir}/privilege-control/db/updater.sh
index ffbaeff..e929637 100644 (file)
@@ -14,7 +14,6 @@ BuildRequires:  pkgconfig(pthread-stubs)
 %if %{with wayland}
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(wayland-client)
-#BuildRequires:  pkgconfig(wayland-drm)
 %else
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(libdri2)
index 0ed32d2..a831646 100644 (file)
@@ -3,14 +3,14 @@
 %define use_session_bus 0
 %define systemddir /lib/systemd
 
-Name: message-port
-Summary: Message port daemon
-Version: 1.0.3
-Release: 1
-Group: System/Service
-License: LGPL-2.1+
-Source0: %{name}-%{version}.tar.gz
-Source1: %{name}.manifest
+Name:       message-port
+Summary:    Message port daemon
+Version:    1.0.3
+Release:    0
+Group:      System/Service
+License:    LGPL-2.1+
+Source0:    %{name}-%{version}.tar.gz
+Source1:    %{name}.manifest
 
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(dlog)
@@ -45,11 +45,12 @@ 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
+Group:   Development/Testing
 Requires: lib%{name} = %{version}-%{release}
 
 %description -n %{name}-tests
@@ -61,20 +62,19 @@ Unit tests for messageport implementation.
 %prep
 %setup -q -n %{name}-%{version}
 cp -a %{SOURCE1} .
-mkdir m4 > /dev/null
-autoreconf -f -i
+mkdir -p m4 > /dev/null
 
 
 %build
-%configure \
+%reconfigure \
 %if %{build_tests} == 1
-     --enable-tests\
+     --enable-tests \
 %endif
 %if %{use_session_bus} == 1
     --enable-sessionbus \
 %endif
 
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 
 %install
@@ -83,6 +83,7 @@ make %{?_smp_mflags}
 mkdir -p ${RPM_BUILD_ROOT}%{systemddir}/system
 cp messageportd.service $RPM_BUILD_ROOT%{systemddir}/system
 
+
 %post
 /bin/systemctl enable messageportd.service
 
@@ -105,6 +106,7 @@ cp messageportd.service $RPM_BUILD_ROOT%{systemddir}/system
 %manifest %{name}.manifest
 %endif
 %{systemddir}/system/messageportd.service
+%license COPYING.LIB
 
 # libmessage-port
 %files -n lib%{name}
@@ -114,7 +116,6 @@ cp messageportd.service $RPM_BUILD_ROOT%{systemddir}/system
 %doc AUTHORS COPYING.LIB README
 %{_libdir}/lib%{name}.so*
 
-
 #libmessage-port-devel
 %files -n lib%{name}-devel
 %defattr(-,root,root,-)
index f54ccb5..e1897e9 100644 (file)
 # TODO: take care of /lib vs /lib64...
 %define systemddir /lib/systemd
 
+#
+# Abnormalize _with_icosyscon to _enable_icosyscon
+#
+# Since some people seem to have a hard time understanding that
+#
+# 1) the right way to disable a conditional _with_* rpm macro is to leave it
+#    undefined as opposed to defining it to 0
+#
+# 2) if you decide to do it the wrong way at least you should be consistent
+#    about it and not randomly change between the conventions
+#
+# we need to roll this butt-ugly hack to make sure that we always go with
+# the wrong convention. We always set up _enable_icosyscon to 1 or 0 depending
+# on how _with_icosyscon happens to be set (or unset).
+#
+
+%if %{!?_with_icosyscon:0}%{?_with_icosyscon:1}
+%if %{_with_icosyscon}
+%define _enable_icosyscon 1
+%else
+%define _enable_icosyscon 0
+%endif
+%else
+%define _enable_icosyscon 0
+%endif
+
 Summary: Murphy policy framework
 Name: murphy
-Version: 0.0.53
+Version: 0.0.54
 Release: 1
 License: BSD-3-Clause
 Group: System/Service
@@ -83,11 +109,13 @@ BuildRequires: pkgconfig(json)
 BuildRequires: pkgconfig(libsmack)
 %endif
 
-%if %{_with_icosyscon}
+%if %{?_with_icosyscon:1}%{!?_with_icosyscon:0}
+#%if %{_with_icosyscon} # gbs can't, so don't bother...
 BuildRequires: ico-uxf-weston-plugin-devel
 BuildRequires: pkgconfig(ail)
 BuildRequires: pkgconfig(aul)
 BuildRequires: libxml2-devel
+#%endif
 %endif
 
 %if %{?_with_squashpkg:0}%{!?_with_squashpkg:1}
@@ -214,7 +242,7 @@ Requires: %{name} = %{version}
 Summary: Murphy IVI resource manager plugin
 Group: System/Service
 
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 %package system-controller
 Summary: Murphy IVI System Controller plugin
 Group: System/Service
@@ -281,7 +309,7 @@ This package contains various test binaries for Murphy.
 %description ivi-resource-manager
 This package contains the Murphy IVI resource manager plugin.
 
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 %description system-controller
 This package contains the Murphy IVI resource manager plugin.
 %endif
@@ -289,6 +317,9 @@ This package contains the Murphy IVI resource manager plugin.
 %prep
 %setup -q
 
+echo "_with_icosyscon:   \"%{_with_icosyscon}\""
+echo "_enable_icosyscon: \"%{_enable_icosyscon}\""
+
 %build
 %if %{?_with_debug:1}%{!?_with_debug:0}
 export CFLAGS="-O0 -g3"
@@ -353,7 +384,7 @@ CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-smack"
 CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-smack"
 %endif
 
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-system-controller"
 %else
 CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-system-controller"
@@ -423,7 +454,7 @@ cp packaging.in/murphyd.conf $RPM_BUILD_ROOT%{_tmpfilesdir}
 mkdir -p $RPM_BUILD_ROOT%{systemddir}/system
 mkdir -p $RPM_BUILD_ROOT%{systemddir}/user
 cp packaging.in/murphyd.service $RPM_BUILD_ROOT%{systemddir}/system
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 cp packaging.in/ico-homescreen.service $RPM_BUILD_ROOT%{systemddir}/user
 cp packaging.in/murphy-wait-for-launchpad-ready.path $RPM_BUILD_ROOT%{systemddir}/user
 %endif
@@ -449,7 +480,7 @@ cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/murphy-pulse.manifest
 %if %{?_with_ecore:1}%{!?_with_ecore:0}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/murphy-ecore.manifest
 %endif
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/murphy-system-controller.manifest
 %endif
 
@@ -507,7 +538,7 @@ lfconfig
 ldconfig
 %endif
 
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 %post system-controller
 # prevent system controller from starting
 rm -f %{systemddir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
@@ -697,7 +728,7 @@ fi
 %{_libdir}/murphy/plugins/plugin-ivi-resource-manager.so
 %manifest %{_datadir}/murphy-ivi-resource-manager.manifest
 
-%if %{_with_icosyscon}
+%if %{_enable_icosyscon}
 %files system-controller
 %defattr(-,root,root,-)
 %{_libdir}/murphy/plugins/plugin-system-controller.so
index 6ed3f77..644060b 100644 (file)
@@ -25,7 +25,7 @@ A service to export OFono/Obex functionality over DBUS, to be used by WebRuntime
 
 export LDFLAGS+="-Wl,--rpath=%{PREFIX} -Wl,--as-needed"
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DENABLE_TIME_TRACER="OFF"
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DENABLE_TIME_TRACER="OFF"
 
 make %{?jobs:-j%jobs} VERBOSE=1
 
@@ -33,9 +33,12 @@ make %{?jobs:-j%jobs} VERBOSE=1
 rm -rf %{buildroot}
 %make_install
 
+%install_service ../user/weston.target.wants phoned.service
+
 %files
 %{_libdir}/pkgconfig/phoned.pc
-%{_prefix}/sbin/phoned
+%{_prefix}/bin/phoned
 %{_prefix}/share/dbus-1/services/org.tizen.phone.service
-%{_prefix}/lib/systemd/user/phoned.service
+%{_unitdir_user}/phoned.service
+%{_unitdir_user}/weston.target.wants/phoned.service
 
index 73cbfcf..2b2955b 100644 (file)
@@ -1,6 +1,6 @@
 Summary: Pulseaudio module for enforcing policy decisions in the audio domain
 Name: pulseaudio-module-murphy-ivi
-Version:  0.9.27
+Version:  0.9.28
 Release: 0
 License: LGPLv2.1
 Group: System Environment/Daemons
@@ -18,10 +18,11 @@ BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: libtool-ltdl-devel
 Buildrequires: pkgconfig(json)
 BuildRequires: config(pulseaudio)
+BuildRequires: pulseaudio >= 5.0
 BuildRequires: pkgconfig(murphy-pulse)
 BuildRequires: murphy-pulse
 BuildRequires: pkgconfig(aul)
-Requires: pulseaudio
+Requires: pulseaudio >= 5.0
 Requires: aul
 Conflicts: pulseaudio-module-combine-sink
 Conflicts: pulseaudio-module-augment-properties
index 1868d12..9fb9c36 100644 (file)
@@ -146,6 +146,7 @@ export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections"
     --with-cap \
     --enable-shared \
     --enable-python \
+    --with-vendor=tizen \
     --with-msm 
 
 make %{?_smp_mflags}
@@ -205,6 +206,10 @@ for i in %{_datadir}/automake-*/*; do
   fi
 done
 popd
+%ifarch aarch64 ppc64le
+install -m 755 config.guess %{buildroot}/usr/lib/rpm
+install -m 755 config.sub %{buildroot}/usr/lib/rpm
+%endif
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{__plugindir}/*.la
 
@@ -289,6 +294,9 @@ rm -f %{_dbpath}/Filemd5s \
 %{rpmhome}/*.req
 %{rpmhome}/macros.*
 %{rpmhome}/fileattrs
+%ifarch aarch64 ppc64le
+%{rpmhome}/config.*
+%endif
 
 %files devel
 %manifest %{name}.manifest
@@ -310,8 +318,8 @@ rm -f %{_dbpath}/Filemd5s \
 
 %files -n python-rpm
 %defattr(-,root,root)
-%{_libdir}/python*/site-packages/rpm
-%attr(755,root,root) %{_libdir}/python*/site-packages/rpm/transaction.py
+%{python_sitearch}/rpm
+%attr(755,root,root) %{python_sitearch}/rpm/transaction.py
 
 %lang_package
 
index 7a98927..463276e 100644 (file)
@@ -139,9 +139,7 @@ update-mime-database /usr/share/mime
 %dir %{_sysconfdir}/package-manager/backendlib
 %dir %{_sysconfdir}/opt/upgrade
 %{_sysconfdir}/opt/upgrade/pkgmgr.patch.sh
-%attr(4755, root, root) %{_bindir}/pkgcmd
-%{_bindir}/pkgcmd.real
-%attr(755, root, root) %{_bindir}/pkgcmd.wrapper
+%{_bindir}/pkgcmd
 %{_bindir}/pkg_initdb
 %{_bindir}/pkg_getsize
 %{_bindir}/pkginfo
index a338425..a785fa2 100644 (file)
@@ -1,8 +1,8 @@
 Name:       sphinxbase
 Version:    0.7
-Release:    1
+Release:    0
 Group:      System/Libraries
-License:    BSD
+License:    BSD-2-Clause
 URL:        http://www.pocketsphinx.org/
 Summary:    Speech Recognition Engine
 Source:     http://sourceforge.net/projects/cmusphinx/files/%{name}/%{version}/%{name}-%{version}.tar.gz
@@ -35,28 +35,27 @@ Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description python
-Python interface to sphinxbase.
+Python interface to sphinxbase package
 
 %prep
 %setup -q
 
 %build
-%configure --disable-static --disable-rpath
-
-make %{?_smp_mflags}
+%reconfigure --disable-static --disable-rpath
+%__make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{python_sitearch}
+%make_install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.la
 
 # Install the man pages
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p %{buildroot}%{_mandir}/man1
+cp -p doc/*.1 %{buildroot}%{_mandir}/man1
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post libs -p /sbin/ldconfig
 
@@ -76,7 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_libdir}/libsphinxad.so.*
 %{_libdir}/libsphinxbase.so.*
 
index 96b31a8..7341a70 100644 (file)
@@ -10,7 +10,6 @@ Source0:        %{name}-%{version}.tar.gz
 Source1001:     capi-system-info.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(capi-media-sound-manager)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libxml-2.0)
diff --git a/proto-meta-Tizen_generic/specfile-initial/system-server/packaging/system-server.spec b/proto-meta-Tizen_generic/specfile-initial/system-server/packaging/system-server.spec
new file mode 100755 (executable)
index 0000000..a7fe1bc
--- /dev/null
@@ -0,0 +1,406 @@
+%bcond_with x
+
+#sbs-git:slp/pkgs/s/system-server system-server 0.1.51 56e16bca39f96d6c8aed9ed3df2fea9b393801be
+Name:       system-server
+Summary:    System server
+Version:    2.0.0
+Release:    0
+Group:      System/Service
+License:    Apache-2.0
+Source0:    system-server-%{version}.tar.gz
+Source1:    system-server.manifest
+Source2:    deviced.manifest
+Source3:    sysman.manifest
+Source4:    libslp-pm.manifest
+Source5:    haptic.manifest
+Source6:    devman.manifest
+Source8:    regpmon.service
+Source9:    zbooting-done.service
+BuildRequires:  cmake
+BuildRequires:  libattr-devel
+BuildRequires:  pkgconfig(ecore)
+BuildRequires:  pkgconfig(heynoti)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(tapi)
+BuildRequires:  pkgconfig(edbus)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(syspopup-caller)
+%if %{with x}
+BuildRequires:  pkgconfig(x11)
+%endif
+BuildRequires:  pkgconfig(notification)
+BuildRequires:  pkgconfig(usbutils)
+BuildRequires:  pkgconfig(udev)
+BuildRequires:  pkgconfig(device-node)
+BuildRequires:  pkgconfig(libsmack)
+BuildRequires:  gettext
+BuildRequires:  pkgconfig(sensor)
+BuildRequires:  pkgconfig(libsystemd-daemon)
+BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(libtzplatform-config)
+
+%{?systemd_requires}
+Requires(post): /usr/bin/vconftool
+
+%description
+system server
+
+%package -n sysman
+Summary:    Sysman library
+Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description -n sysman
+System manager interface library.
+
+%package -n sysman-devel
+Summary:    Sysman devel library
+Group:      System/Development
+Requires:   sysman = %{version}-%{release}
+
+%description -n sysman-devel
+sysman devel library.
+
+%package -n sysman-internal-devel
+Summary:    Sysman internal devel library
+Group:      System/Development
+Requires:   sysman = %{version}-%{release}
+
+%description -n sysman-internal-devel
+sysman internal devel library.
+
+%package -n libslp-pm
+Summary:    Power manager client
+Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description -n libslp-pm
+power-manager library.
+
+%package -n libslp-pm-devel
+Summary:    Power manager client (devel)
+Group:      System/Development
+Requires:   libslp-pm = %{version}-%{release}
+
+%description -n libslp-pm-devel
+power-manager devel library.
+
+%package -n libhaptic
+Summary:    Haptic library
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description -n libhaptic
+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
+Requires:   libhaptic = %{version}-%{release}
+
+%description -n libhaptic-plugin-devel
+Haptic plugin library for device control (devel)
+
+%package -n libdevman
+Summary:    Device manager library
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%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)
+
+%package -n libdeviced
+Summary:    Deviced library
+Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description -n libdeviced
+Deviced library for device control
+
+%package -n libdeviced-devel
+Summary:    Deviced library for (devel)
+Group:      System/Development
+Requires:   libdeviced = %{version}-%{release}
+
+%description -n libdeviced-devel
+Deviced library for device control (devel)
+
+%prep
+%setup -q
+
+%cmake . \
+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%if %{with x}
+    -DX11_SUPPORT=On \
+%else
+    -DX11_SUPPORT=Off \
+%endif
+    #eol
+
+%build
+cp %{SOURCE1} .
+cp %{SOURCE2} .
+cp %{SOURCE3} .
+cp %{SOURCE4} .
+cp %{SOURCE5} .
+cp %{SOURCE6} .
+%cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC
+
+%install
+%make_install
+
+%install_service multi-user.target.wants system-server.service
+%install_service sockets.target.wants system-server.socket
+
+%install_service graphical.target.wants regpmon.service
+install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/regpmon.service
+
+%install_service graphical.target.wants zbooting-done.service
+install -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/zbooting-done.service
+
+%if 0%{?simulator}
+rm -f %{buildroot}%{_bindir}/restart
+%endif
+
+%post
+#memory type vconf key init
+users_gid=$(getent group $TZ_SYS_USER_GROUP | cut -f3 -d':')
+
+vconftool set -t int memory/sysman/usbhost_status -1 -i
+vconftool set -t int memory/sysman/mmc 0 -i
+vconftool set -t int memory/sysman/earjack_key 0 -i
+vconftool set -t int memory/sysman/added_usb_storage 0 -i
+vconftool set -t int memory/sysman/removed_usb_storage 0 -i
+vconftool set -t int memory/sysman/charger_status -1 -i
+vconftool set -t int memory/sysman/charge_now -1 -i
+vconftool set -t int memory/sysman/battery_status_low -1 -i
+vconftool set -t int memory/sysman/battery_capacity -1 -i
+vconftool set -t int memory/sysman/usb_status -1 -i
+vconftool set -t int memory/sysman/earjack -1 -i
+vconftool set -t int memory/sysman/low_memory 1 -i
+vconftool set -t int memory/sysman/sliding_keyboard -1 -i
+vconftool set -t int memory/sysman/mmc_mount -1 -i
+vconftool set -t int memory/sysman/mmc_unmount -1 -i
+vconftool set -t int memory/sysman/mmc_format -1 -i
+vconftool set -t int memory/sysman/mmc_format_progress 0 -i
+vconftool set -t int memory/sysman/mmc_err_status 0 -i
+vconftool set -t int memory/sysman/power_off 0 -g $users_gid -i -f
+vconftool set -t int memory/sysman/battery_level_status -1 -i
+vconftool set -t string memory/private/sysman/added_storage_uevent "" -i
+vconftool set -t string memory/private/sysman/removed_storage_uevent "" -g $users_gid -i
+
+vconftool set -t int memory/sysman/hdmi 0 -i
+
+vconftool set -t int memory/sysman/stime_changed 0 -i
+
+#db type vconf key init
+vconftool set -t int db/sysman/mmc_dev_changed 0 -i
+
+vconftool set -t int memory/pm/state 0 -i -g $users_gid
+vconftool set -t int memory/pm/battery_timetofull -1 -i
+vconftool set -t int memory/pm/battery_timetoempty -1 -i
+vconftool set -t int memory/pm/sip_status 0 -i -g $users_gid
+vconftool set -t int memory/pm/custom_brightness_status 0 -i -g $users_gid
+vconftool set -t bool memory/pm/brt_changed_lpm 0 -i
+vconftool set -t int memory/pm/current_brt 60 -i -g $users_gid
+
+heynotitool set system_wakeup
+heynotitool set pm_event
+
+heynotitool set power_off_start
+
+heynotitool set mmcblk_add
+heynotitool set mmcblk_remove
+heynotitool set device_charge_chgdet
+heynotitool set device_usb_host_add
+heynotitool set device_usb_host_remove
+heynotitool set device_pci_keyboard_add
+heynotitool set device_pci_keyboard_remove
+
+heynotitool set device_usb_chgdet
+heynotitool set device_ta_chgdet
+heynotitool set device_earjack_chgdet
+heynotitool set device_earkey_chgdet
+heynotitool set device_tvout_chgdet
+heynotitool set device_hdmi_chgdet
+heynotitool set device_keyboard_chgdet
+
+
+systemctl daemon-reload
+if [ "$1" = "1" ]; then
+    systemctl restart system-server.service
+    systemctl restart regpmon.service
+       systemctl restart zbooting-done.service
+fi
+/sbin/ldconfig
+
+%preun
+if [ "$1" = "0" ]; then
+    systemctl stop system-server.service
+    systemctl stop regpmon.service
+       systemctl stop zbooting-done.service
+fi
+
+%postun
+systemctl daemon-reload
+/sbin/ldconfig
+
+%post -n sysman -p /sbin/ldconfig
+
+%postun -n sysman -p /sbin/ldconfig
+
+%post -n libslp-pm -p /sbin/ldconfig
+
+%postun -n libslp-pm -p /sbin/ldconfig
+
+%post -n libhaptic -p /sbin/ldconfig
+
+%postun -n libhaptic -p /sbin/ldconfig
+
+%post -n libdevman -p /sbin/ldconfig
+
+%postun -n libdevman -p /sbin/ldconfig
+
+%post -n libdeviced -p /sbin/ldconfig
+
+%postun -n libdeviced -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%license LICENSE.APLv2
+%config %{_sysconfdir}/dbus-1/system.d/deviced.conf
+%{_bindir}/system_server
+%{_libdir}/system-server/shutdown.sh
+%if %{undefined simulator}
+%{_bindir}/restart
+%endif
+%{_bindir}/movi_format.sh
+%{_bindir}/sys_event
+%{_bindir}/pm_event
+%{_bindir}/regpmon
+%{_bindir}/set_pmon
+%{_bindir}/sys_pci_noti
+%{_bindir}/mmc-smack-label
+%{_bindir}/device-daemon
+%{_bindir}/fsck_msdosfs
+%{_unitdir}/multi-user.target.wants/system-server.service
+%{_unitdir}/graphical.target.wants/regpmon.service
+%{_unitdir}/sockets.target.wants/system-server.socket
+%{_unitdir}/system-server.service
+%{_unitdir}/system-server.socket
+%{_unitdir}/regpmon.service
+%{_unitdir}/graphical.target.wants/zbooting-done.service
+%{_unitdir}/zbooting-done.service
+%{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo
+%{_datadir}/license/fsck_msdosfs
+
+%files -n sysman
+%manifest sysman.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libsysman.so.*
+
+%files -n sysman-devel
+%defattr(-,root,root,-)
+%{_includedir}/sysman/sysman.h
+%{_includedir}/sysman/sysman_managed.h
+%{_includedir}/sysman/sysman_PG.h
+%{_libdir}/pkgconfig/sysman.pc
+%{_libdir}/libsysman.so
+
+%files -n sysman-internal-devel
+%defattr(-,root,root,-)
+%{_includedir}/sysman/sysman-internal.h
+
+%files -n libslp-pm
+%defattr(-,root,root,-)
+%manifest libslp-pm.manifest
+%{_libdir}/libpmapi.so.*
+
+%files -n libslp-pm-devel
+%defattr(-,root,root,-)
+%{_includedir}/pmapi/pmapi.h
+%{_includedir}/pmapi/pmapi_managed.h
+%{_includedir}/pmapi/pm_PG.h
+%{_libdir}/pkgconfig/pmapi.pc
+%{_libdir}/libpmapi.so
+
+%files -n libhaptic
+%defattr(-,root,root,-)
+%{_libdir}/libhaptic.so.*
+%manifest haptic.manifest
+
+%files -n libhaptic-devel
+%defattr(-,root,root,-)
+%{_includedir}/haptic/haptic.h
+%{_libdir}/libhaptic.so
+%{_libdir}/pkgconfig/haptic.pc
+
+%files -n libhaptic-plugin-devel
+%defattr(-,root,root,-)
+%{_includedir}/haptic/haptic_module.h
+%{_includedir}/haptic/haptic_plugin_intf.h
+%{_includedir}/haptic/haptic_PG.h
+%{_libdir}/pkgconfig/haptic-plugin.pc
+
+%files -n libdevman
+%{_bindir}/display_wd
+%{_libdir}/libdevman.so.*
+%manifest devman.manifest
+
+%files -n libdevman-devel
+%{_includedir}/devman/devman.h
+%{_includedir}/devman/devman_image.h
+%{_includedir}/devman/devman_managed.h
+%{_includedir}/devman/devman_haptic.h
+%{_includedir}/devman/devman_PG.h
+%{_libdir}/pkgconfig/devman.pc
+%{_libdir}/libdevman.so
+
+%files -n libdevman-haptic-devel
+%{_includedir}/devman/devman_haptic_ext.h
+%{_includedir}/devman/devman_haptic_ext_core.h
+%{_libdir}/pkgconfig/devman_haptic.pc
+
+%files -n libdeviced
+%defattr(-,root,root,-)
+%{_libdir}/libdeviced.so.*
+%manifest deviced.manifest
+
+%files -n libdeviced-devel
+%defattr(-,root,root,-)
+%{_includedir}/deviced/dd-battery.h
+%{_includedir}/deviced/dd-control.h
+%{_includedir}/deviced/dd-deviced.h
+%{_includedir}/deviced/dd-deviced-managed.h
+%{_includedir}/deviced/dd-display.h
+%{_includedir}/deviced/dd-haptic.h
+%{_includedir}/deviced/dd-led.h
+%{_includedir}/deviced/haptic-module.h
+%{_includedir}/deviced/haptic-plugin-intf.h
+%{_libdir}/libdeviced.so
+%{_libdir}/pkgconfig/deviced.pc
+
index de52c1c..eb25d1c 100644 (file)
@@ -8,7 +8,7 @@
 %define _audiosystem_demo_package tizen-extensions-crosswalk-audiosystem-demo
 
 Name:       tizen-extensions-crosswalk
-Version:    0.90
+Version:    0.92
 Release:    0
 License:    BSD-3-Clause and Apache-2.0
 Group:      Development/Libraries
index d1f160e..b9ffe97 100644 (file)
@@ -39,7 +39,7 @@ cd %name
 mkdir -p %{buildroot}%{_rpmconfigdir}
 install -m0755 %SOURCE0 %SOURCE1 %{buildroot}%{_rpmconfigdir}
 install -m0644 -D %SOURCE2 %{buildroot}%{_sysconfdir}/rpm/macros.%name
-install -m0755 -D %SOURCE4 %{buildroot}%{_libdir}/rpm/brp-tizen.d/brp-70-trim-desktopfiles
+install -m0755 -D %SOURCE4 %{buildroot}%{_rpmconfigdir}/brp-tizen.d/brp-70-trim-desktopfiles
 
 %files
 %manifest %{name}.manifest
index ec07182..d62e9ce 100644 (file)
@@ -1,13 +1,14 @@
 Name:           genivi-shell
-Version:        0.2.2
+Version:        0.2.3
 Release:        0
 Summary:        GENIVI Shell Plugin-in
 License:        Apache-2.0
 Group:          Graphics & UI Framework/Wayland Window System
 Url:            http://git.projects.genivi.org/wayland-ivi-extension.git
 Source0:        %name-%version.tar.gz
-Source1001:    genivi-shell.manifest
+Source1001:     genivi-shell.manifest
 BuildRequires:  cmake
+BuildRequires:  weston-ivi-shell-devel >= 0.1.7
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-server)
@@ -23,7 +24,8 @@ manager client interface.
 %package devel
 Summary: Development files for package %{name}
 Group:   Graphics & UI Framework/Development
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig(weston) >= 1.5
 %description devel
 This package provides header files and other developer files needed for
 creating GENIVI layer manager clients.
@@ -35,16 +37,24 @@ cp %{SOURCE1001} .
 /usr/bin/wayland-scanner code < protocol/ivi-controller.xml \
     > protocol/ivi-controller-protocol.c
 
+cat ivi-extension-protocol.pc.in \
+    | sed s\#@libdir@\#%{_libdir}\#g \
+    | sed s\#@includedir@\#%{_includedir}/%{name}\#g \
+    | sed s\#@name@\#%{name}\#g \
+    | sed s\#@package_version@\#%{version}\#g \
+    > ivi-extension-protocol.pc
 
 %cmake .
 
 %build
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 %make_install
 
+install -d %{buildroot}/%{_includedir}/%{name}/
+install -d %{buildroot}/%{_libdir}/pkgconfig/
 install -d %{buildroot}/%{_datadir}/%{name}/protocol/
 
 install -m 644 protocol/ivi-application.xml %{buildroot}/%{_datadir}/%{name}/protocol/
@@ -56,18 +66,31 @@ install -m 644 protocol/ivi-application-server-protocol.h \
 install -m 644 protocol/ivi-application-protocol.c \
     %{buildroot}/%{_datadir}/%{name}/protocol/
 
+install -m 644 protocol/ivi-application-client-protocol.h \
+    %{buildroot}/%{_includedir}/%{name}/
+
 install -m 644 protocol/ivi-controller-server-protocol.h \
     %{buildroot}/%{_datadir}/%{name}/protocol/
 
 install -m 644 protocol/ivi-controller-protocol.c \
     %{buildroot}/%{_datadir}/%{name}/protocol/
 
+install -m 644 protocol/ivi-controller-client-protocol.h \
+    %{buildroot}/%{_includedir}/%{name}/
+
+install -m 644 protocol/libivi-extension-protocol.a \
+    %{buildroot}/%{_libdir}/
+
+install -m 644  ivi-extension-protocol.pc \
+    %{buildroot}/%{_libdir}/pkgconfig/
+
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root)
+%{_bindir}/IVISurfaceCreator
 %{_bindir}/LayerManagerControl
 %{_bindir}/EGLWLMockNavigation
 %{_libdir}/libilmClient.so.*
@@ -82,11 +105,12 @@ install -m 644 protocol/ivi-controller-protocol.c \
 %{_includedir}/ilm/ilm_control.h
 %{_includedir}/ilm/ilm_platform.h
 %{_includedir}/ilm/ilm_types.h
+%{_includedir}/%{name}/*.h
 %{_libdir}/libilmClient.so
 %{_libdir}/libilmCommon.so
 %{_libdir}/libilmControl.so
+%{_libdir}/libivi-extension-protocol.a
+%{_libdir}/pkgconfig/ivi-extension-protocol.pc
 %{_datadir}/%{name}/protocol/*.xml
 %{_datadir}/%{name}/protocol/*.h
 %{_datadir}/%{name}/protocol/*.c
-
-
index 62de44a..4e9bf9b 100644 (file)
@@ -1,5 +1,5 @@
 Name:           weston-ivi-shell
-Version:        0.1.5
+Version:        0.1.7
 Release:        0
 Summary:        Weston IVI Shell
 License:        MIT
@@ -76,10 +76,15 @@ cp %{SOURCE1001} .
     --enable-simple-clients \
     --enable-clients \
     --disable-wcap-tools \
-    --disable-demo-clients-install \
+    --enable-demo-clients-install \
     --disable-libinput-backend \
-    --disable-fullscreen-shell
-make %{?_smp_mflags}
+    --disable-fullscreen-shell \
+    --disable-desktop-shell \
+    --disable-simple-clients \
+    --enable-ivi-shell
+
+%__make %{?_smp_mflags}
+
 
 %install
 %make_install
@@ -87,22 +92,23 @@ make %{?_smp_mflags}
 # install example clients
 %define ivi_shell_client_dir %{_bindir}/ivi
 mkdir -p %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-calibrator %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-simple-touch %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-simple-shm %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-simple-egl %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-flower %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-image %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-cliptest %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-dnd %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-editor %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-smoke %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-resizor %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-eventdemo %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-clickdot %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-subsurfaces %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-transformed %{buildroot}%{ivi_shell_client_dir}
-install -m 755 weston-fullscreen %{buildroot}%{ivi_shell_client_dir}
+#mv %{buildroot}%{_bindir}/weston-calibrator %{buildroot}%{ivi_shell_client_dir}
+#mv %{buildroot}%{_bindir}/weston-simple-touch %{buildroot}%{ivi_shell_client_dir}
+#mv %{buildroot}%{_bindir}/weston-simple-shm %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-simple-egl %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-flower %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-image %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-cliptest %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-dnd %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-editor %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-smoke %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-resizor %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-eventdemo %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-clickdot %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-subsurfaces %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-transformed %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-fullscreen %{buildroot}%{ivi_shell_client_dir}
+mv %{buildroot}%{_bindir}/weston-terminal %{buildroot}%{ivi_shell_client_dir}
 
 install -d %{buildroot}/%{_datadir}/%{name}/protocol/
 
@@ -134,18 +140,22 @@ cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 %_libexecdir/weston-ivi-shell-user-interface
 %_datadir/weston/*
 
+%exclude %_bindir/weston
+%exclude %_libdir/weston/desktop-shell.so
+
 %files devel
 %manifest %{name}.manifest
 %_includedir/weston/ivi-layout-export.h
 %_includedir/weston/ivi-layout.h
 %_includedir/weston/ivi-shell.h
+%_includedir/weston/ivi-shell-ext.h
 %_includedir/weston/ivi-layout-transition.h
 %{_datadir}/%{name}/protocol/*
 
 %files clients
 %manifest %{name}.manifest
-%{ivi_shell_client_dir}/weston-simple-touch
-%{ivi_shell_client_dir}/weston-simple-shm
+#%{ivi_shell_client_dir}/weston-simple-touch
+#%{ivi_shell_client_dir}/weston-simple-shm
 %{ivi_shell_client_dir}/weston-simple-egl
 %{ivi_shell_client_dir}/weston-flower
 %{ivi_shell_client_dir}/weston-image
@@ -159,9 +169,11 @@ cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 %{ivi_shell_client_dir}/weston-subsurfaces
 %{ivi_shell_client_dir}/weston-transformed
 %{ivi_shell_client_dir}/weston-fullscreen
-%{ivi_shell_client_dir}/weston-calibrator
+%{ivi_shell_client_dir}/weston-terminal
+#%{ivi_shell_client_dir}/weston-calibrator
 
 %files config
 %manifest %{name}.manifest
 %config %{weston_config_dir}/weston.ini
 
+%exclude %_libdir/pkgconfig/weston.pc