- update spec file.
authorRonan Le Martret <ronan@fridu.net>
Tue, 25 Jun 2013 15:43:11 +0000 (17:43 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 25 Jun 2013 15:43:11 +0000 (17:43 +0200)
prometa-Tizen_ivi_3.0/manifest_file/.gitignore
prometa-Tizen_ivi_3.0/specfile-initial/bluez/bluez.spec
prometa-Tizen_ivi_3.0/specfile-initial/e17-extra-config-modules/e17-extra-config-modules.spec [deleted file]
prometa-Tizen_ivi_3.0/specfile-initial/gsignond/gsignond.spec
prometa-Tizen_ivi_3.0/specfile-initial/gstreamer/gstreamer.spec
prometa-Tizen_ivi_3.0/specfile-initial/libgsignon-glib/libgsignon-glib.spec
prometa-Tizen_ivi_3.0/specfile-initial/libsvi/libfeedback.spec [deleted file]
prometa-Tizen_ivi_3.0/specfile-initial/pulseaudio/pulseaudio.spec
prometa-Tizen_ivi_3.0/specfile-initial/weston/weston.spec
prometa-Tizen_ivi_3.0/specfile-initial/wrt/wrt.spec

index 72a3885..6722cd9 100644 (file)
@@ -1 +1 @@
-tizen_20130620.2_ia32.xml tizen_20130620.3_ia32.xml tizen_20130621.2_ia32.xml tizen_20130624.11_ia32.xml tizen_20130624.1_ia32.xml tizen_20130625.1_ia32.xml
+*.xml
index d2d2574..d4442ef 100644 (file)
@@ -1,3 +1,5 @@
+%bcond_with ofono
+
 %define with_libcapng --enable-capng
 
 Name:           bluez
@@ -30,6 +32,7 @@ Source3:        bluetooth.sysconfig
 Source4:        bluetooth.sh
 Source5:        baselibs.conf
 Source7:        bluetooth.modprobe
+Source8:        audio.conf
 
 %define cups_lib_dir %{_prefix}/lib/cups
 
@@ -150,6 +153,11 @@ autoreconf -fiv
                        --enable-thermometer    \
                        --enable-datafiles      \
                        --enable-pcmcia \
+                       --enable-health \
+                       --enable-dbusoob \
+%if %{with ofono}
+                       --with-telephony=ofono \
+%endif
             --with-systemdunitdir=%{_unitdir} \
                        %{?with_libcapng}
 make %{?_smp_mflags} all V=1
@@ -181,6 +189,7 @@ cd ..
 rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-*
 install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/usr/lib/udev/bluetooth.sh
 install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
+install --mode=0644 -D %{S:8} $RPM_BUILD_ROOT/%{_sysconfdir}/bluetooth/audio.conf
 if ! test -e %{buildroot}%{cups_lib_dir}/backend/bluetooth
 then if test -e %{buildroot}%{_libdir}/cups/backend/bluetooth
      then mkdir -p %{buildroot}%{cups_lib_dir}/backend
@@ -225,6 +234,7 @@ install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth
 %dir %{_sysconfdir}/bluetooth
 %config(noreplace) %{_sysconfdir}/bluetooth/main.conf
 %config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
+%config(noreplace) %{_sysconfdir}/bluetooth/audio.conf
 %config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 %dir /var/lib/bluetooth
 %dir %{_sysconfdir}/modprobe.d
diff --git a/prometa-Tizen_ivi_3.0/specfile-initial/e17-extra-config-modules/e17-extra-config-modules.spec b/prometa-Tizen_ivi_3.0/specfile-initial/e17-extra-config-modules/e17-extra-config-modules.spec
deleted file mode 100644 (file)
index 3d663e7..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-Name:           e17-extra-config-modules
-Summary:        The E17 Extra Config Modules
-Version:        0.1.28
-Release:        1
-Group:          Graphical desktop/Enlightenment
-License:        BSD
-Source0:        %{name}-%{version}.tar.gz
-BuildRequires:  pkgconfig(enlightenment)
-BuildRequires:  pkgconfig(utilX)
-BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(dlog)
-Requires:       libX11
-
-
-%description
-The E17 Extra Config Modules  The E17 extra config modules consists of modules made by SAMSUNG.
-
-
-%prep
-%setup -q
-
-
-%build
-export CFLAGS+=" -Wall -g -fPIC -rdynamic"
-export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
-
-%ifarch %{arm}
-export CFLAGS+=" -D_ENV_ARM"
-%endif
-
-for FILE in config-tizen
-do
-        (cd $FILE && ./autogen.sh && ./configure --prefix=/usr && make )
-done
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name}
-
-for FILE in config-tizen
-do
-        (cd $FILE && %make_install )
-done
-
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/enlightenment/modules/config-tizen/*
-/usr/share/license/%{name}
-%manifest %{name}.manifest
index d87723e..f5fa51d 100644 (file)
@@ -1,17 +1,19 @@
 # define used dbus type [p2p, session, system]
-%define dbus_type session
+%define dbus_type p2p
 # 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: gsignond
 Summary: GLib based Single Sign-On daemon
-Version: 0.0.1
+Version: 0.0.2
 Release: 9
 Group: System/Daemons
 License: LGPL
 Source: %{name}-%{version}.tar.gz
+%if %{dbus_type} != "p2p"
 Requires: dbus-1
+%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires: pkgconfig(dbus-1)
index 1a6f981..315f203 100644 (file)
-Name:       gstreamer0.10
-Summary:    GStreamer streaming media framework runtime
-Version:    0.10.36
-Release:    6
-Group:      Applications/Multimedia
-License:    LGPLv2+
-Source0:    %{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(mm-ta)
+%bcond_with introspection
+
+Name:           gstreamer
+Version:        1.0.7
+Release:        0
+%define gst_branch 1.0
+Summary:        Streaming-Media Framework Runtime
+License:        LGPL-2.1+
+Group:          Multimedia/Multimedia Framework 
+Url:            http://gstreamer.freedesktop.org/
+Source0:        http://download.gnome.org/sources/gstreamer/1.0/%{name}-%{version}.tar.xz
+Source1:        gstreamer.macros
+Source2:        gstreamer.prov
+Source99:       baselibs.conf
 BuildRequires:  bison
+BuildRequires: gettext-tools
+BuildRequires:  check-devel
+BuildRequires:  fdupes
 BuildRequires:  flex
-
+BuildRequires:  glib2-devel >= 2.32.0
+BuildRequires:  libtool
+BuildRequires:  gst-common
+BuildRequires:  libxml2-devel
+%if %{with introspection}
+BuildRequires:  gobject-introspection-devel >= 1.31.1
+%endif
+Requires:       libgstreamer >= %{version}
 
 %description
-GStreamer is a streaming media framework, based on graphs of filters which
-operate on media data. Applications using this library can do anything
-from real-time sound processing to playing videos, and just about anything
-else media-related.  Its plugin-based architecture means that new data
-types or processing capabilities can be added simply by installing new 
-plugins.
-
-
+GStreamer is a streaming-media framework, based on graphs of filters
+which operate on media data. Applications using this library can do
+anything from real-time sound processing to playing videos, and just
+about anything else media-related.  Its plug-in-based architecture
+means that new data types or processing capabilities can be added by
+installing new plug-ins.
+
+%package -n libgstreamer
+Summary:        Streaming-Media Framework Runtime
+Group:          Multimedia/Multimedia Framework
+# We want to have core modules installed:
+Requires:       %{name}
+
+%description -n libgstreamer
+GStreamer is a streaming-media framework, based on graphs of filters
+which operate on media data. Applications using this library can do
+anything from real-time sound processing to playing videos, and just
+about anything else media-related.  Its plug-in-based architecture
+means that new data types or processing capabilities can be added by
+installing new plug-ins.
+
+%package -n typelib-Gst
+Summary:        Streaming-Media Framework Runtime -- Introspection bindings
+Group:          Multimedia/Multimedia Framework
+
+%description -n typelib-Gst
+GStreamer is a streaming-media framework, based on graphs of filters
+which operate on media data. Applications using this library can do
+anything from real-time sound processing to playing videos, and just
+about anything else media-related.  Its plug-in-based architecture
+means that new data types or processing capabilities can be added by
+installing new plug-ins.
+
+This package provides the GObject Introspection bindings for GStreamer.
+
+%package utils
+Summary:        Streaming-Media Framework Runtime
+Group:          Multimedia/Multimedia Framework
+Provides:       gstreamer:%{_bindir}/gst-launch-%{gst_branch} = %{version}
+# Symbol for unversioned wrappers:
+Provides:       gstreamer-utils_versioned = %{version}
+
+%description utils
+GStreamer is a streaming-media framework, based on graphs of filters
+which operate on media data. Applications using this library can do
+anything from real-time sound processing to playing videos, and just
+about anything else media-related.  Its plug-in-based architecture
+means that new data types or processing capabilities can be added by
+installing new plug-ins.
 
 %package devel
-Summary:    Development tools for GStreamer
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Summary:        Include Files and Libraries mandatory for Development
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
+# gstreamer-utils is required for the gstreamer-provides rpm magic.
+Requires:       gstreamer-utils = %{version}
+Requires:       libgstreamer = %{version}
+%if %{with introspection} 
+Requires:       typelib-Gst = %{version}
+%endif
 
 %description devel
-This package contains the libraries and includes files necessary to develop
-applications and plugins for GStreamer. If you plan to develop applications
-with GStreamer, consider installing the gstreamer-devel-docs package and the
-documentation packages for any plugins you intend to use.
-
-
-%package tools
-Summary:    Common tools and files for GStreamer streaming media framework
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}-%{release}
-
-%description tools
-This package contains wrapper scripts for the command-line tools that work
-with different major/minor versions of GStreamer.
-
+This package contains all necessary include files and libraries needed
+to develop applications that require these.
 
+%lang_package
 
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q -n gstreamer-%{version}
+rm -rf common
+cp -a %{_datadir}/gst-common common
+find common -exec touch {} \;
 
 %build
-
-
-export CFLAGS+=" -Wall -g -fPIC\
- -DGST_EXT_AV_RECORDING\
- -DGST_EXT_QUEUE_ENHANCEMENT\
- -DGST_EXT_CURRENT_BYTES\
- -DGST_EXT_BASEPARSER_MODIFICATION\
- -DGST_EXT_BASIC_MODIFICATION\
- -DGST_EXT_MODIFIED_DQBUF"
-
-%configure --prefix=/usr\
- --disable-valgrind\
- --without-check\
- --disable-static\
- --disable-rpath\
- --disable-libtool-lock\
- --disable-alloc-trace\
- --disable-gcov\
- --disable-nls\
- --disable-examples\
- --disable-tests\
- --disable-failing-tests\
- --disable-docbook\
- --disable-gtk-doc\
- --disable-registry-update\
- --disable-loadsave\
- --with-html-dir=/tmp/dump
-
-make %{?jobs:-j%jobs}
+# FIXME: GTKDOC_CFLAGS, GST_OBJ_CFLAGS:
+# Silently ignored compilation of uninstalled gtk-doc scanners without RPM_OPT_FLAGS.
+export V=1
+NOCONFIGURE=1 ./autogen.sh
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%configure\
+%if %{with introspection}
+        --enable-introspection\
+%endif
+       --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
-
-rm -rf %{buildroot}/tmp/dump
-rm -rf %{buildroot}/%{_libdir}/libgstnet*
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-
-
-
-
-
+mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
+mkdir -p %{buildroot}%{_docdir}/%{name}
+%find_lang %{name}-%{gst_branch}
+mv %{name}-%{gst_branch}.lang %{name}.lang 
+rm -rf %{buildroot}%{_datadir}/gtk-doc
+rm -rf %{buildroot}%{_docdir}/%{name}/manual
+rm -rf %{buildroot}%{_docdir}/%{name}/pwg
+mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
+%__install -m644 -D %{S:1} %{buildroot}%{_libexecdir}/rpm/fileattrs/gstreamer.attr
+%__install -m755 -D %{S:2} %{buildroot}%{_libexecdir}/rpm/gstreamer-provides
+%fdupes %{buildroot}
 
 
+%post -n libgstreamer -p /sbin/ldconfig
 
+%postun -n libgstreamer -p /sbin/ldconfig
 
 %files
-%manifest gstreamer.manifest
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README RELEASE TODO
-%{_libdir}/libgstreamer-0.10.so.*
-%{_libdir}/libgstbase-0.10.so.*
-%{_libdir}/libgstcontroller-0.10.so.*
-%{_libdir}/libgstdataprotocol-0.10.so.*
-#%exclude %{_libdir}/libgstnet-0.10.so.*
-%{_libdir}/libgstcheck-0.10.so.*
-%dir %{_libdir}/gstreamer-0.10
-%{_libdir}/gstreamer-0.10/libgstcoreelements.so
-%{_libdir}/gstreamer-0.10/libgstcoreindexers.so
-%dir %{_libexecdir}/gstreamer-0.10
-%{_libexecdir}/gstreamer-0.10/gst-plugin-scanner
-%{_bindir}/gst-feedback-0.10
-%{_bindir}/gst-inspect-0.10
-%{_bindir}/gst-launch-0.10
-%{_bindir}/gst-typefind-0.10
-%{_bindir}/gst-xmlinspect-0.10
-%doc %{_mandir}/man1/gst-feedback-0.10.*
-%doc %{_mandir}/man1/gst-inspect-0.10.*
-%doc %{_mandir}/man1/gst-launch-0.10.*
-%doc %{_mandir}/man1/gst-typefind-0.10.*
-%doc %{_mandir}/man1/gst-xmlinspect-0.10.*
-
+%defattr(-, root, root)
+%license COPYING
+%dir %{_datadir}/gstreamer-%{gst_branch}
+%dir %{_datadir}/gstreamer-%{gst_branch}/presets
+%dir %{_libdir}/gstreamer-%{gst_branch}
+%{_libdir}/gstreamer-%{gst_branch}/*.so
+%dir %{_libexecdir}/gstreamer-%{gst_branch}
+%{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner
+
+%files -n libgstreamer
+%defattr(-, root, root)
+%{_libdir}/*.so.*
+
+
+%if %{with introspection} 
+%files -n typelib-Gst
+%defattr(-, root, root)
+%{_libdir}/girepository-1.0/Gst-1.0.typelib
+%{_libdir}/girepository-1.0/GstBase-1.0.typelib
+%{_libdir}/girepository-1.0/GstCheck-1.0.typelib
+%{_libdir}/girepository-1.0/GstController-1.0.typelib
+%{_libdir}/girepository-1.0/GstNet-1.0.typelib
+%endif
+
+%files utils
+%defattr(-, root, root)
+%{_bindir}/*-%{gst_branch}
+%doc %{_mandir}/man?/*-%{gst_branch}.*
 
 %files devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/gstreamer-0.10
-%dir %{_includedir}/gstreamer-0.10/gst
-%{_includedir}/gstreamer-0.10/gst/*.h
-%{_includedir}/gstreamer-0.10/gst/base
-%{_includedir}/gstreamer-0.10/gst/check
-%{_includedir}/gstreamer-0.10/gst/controller
-%{_includedir}/gstreamer-0.10/gst/dataprotocol
-%{_includedir}/gstreamer-0.10/gst/net
-%{_datadir}/aclocal/gst-element-check-0.10.m4
-%{_libdir}/libgstreamer-0.10.so
-%{_libdir}/libgstbase-0.10.so
-%{_libdir}/libgstcontroller-0.10.so
-%{_libdir}/libgstdataprotocol-0.10.so
-#%exclude %{_libdir}/libgstnet-0.10.so
-%{_libdir}/libgstcheck-0.10.so
-%{_libdir}/pkgconfig/gstreamer-0.10.pc
-%{_libdir}/pkgconfig/gstreamer-base-0.10.pc
-%{_libdir}/pkgconfig/gstreamer-controller-0.10.pc
-%{_libdir}/pkgconfig/gstreamer-check-0.10.pc
-%{_libdir}/pkgconfig/gstreamer-dataprotocol-0.10.pc
-%{_libdir}/pkgconfig/gstreamer-net-0.10.pc
-
-%files tools
-%manifest gstreamer-tools.manifest
-%defattr(-,root,root,-)
-%{_bindir}/gst-feedback
-%{_bindir}/gst-inspect
-%{_bindir}/gst-launch
-%{_bindir}/gst-typefind
-%{_bindir}/gst-xmlinspect
-#%{_bindir}/gst-xmllaunch
-
+%defattr(-, root, root)
+%{_datadir}/aclocal/*.m4
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_libexecdir}/rpm/gstreamer-provides
+%{_libexecdir}/rpm/fileattrs/gstreamer.attr
+%if %{with introspection} 
+%{_datadir}/gir-1.0/*.gir
+%endif
+
+%changelog
index 25b0c65..3b027fc 100644 (file)
@@ -1,9 +1,9 @@
 #define dbus bus type to use [p2p, session, system]
-%define dbus_type session
+%define dbus_type p2p
 
 Name:       libgsignon-glib
 Summary:    GLib API for the SSO framework
-Version:    2.0.0
+Version:    2.0.1
 Release:    1
 Group:      System/Libraries
 License:    LGPL
diff --git a/prometa-Tizen_ivi_3.0/specfile-initial/libsvi/libfeedback.spec b/prometa-Tizen_ivi_3.0/specfile-initial/libsvi/libfeedback.spec
deleted file mode 100644 (file)
index 64f7269..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-Name:       libfeedback
-Summary:    Feedback library
-Version:    0.1.3
-Release:    0
-Group:      System/Libraries
-License:    Apache License, Version 2.0
-Source0:    %{name}-%{version}.tar.gz
-Source1:       libsvi.manifest
-source2:       libfeedback.manifest
-source3:       svi-data-sdk.manifest
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(mm-keysound)
-BuildRequires:  pkgconfig(haptic)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(capi-base-common)
-
-%description
-Feedback library for playing sound, vibration and led
-
-
-%package -n libfeedback-devel
-Summary:    Feedback library for (devel)
-Group:      Development/Libraries
-Requires:   libfeedback = %{version}-%{release}
-
-%description -n libfeedback-devel
-Feedback library for playing sound, vibration and led (devel)
-
-%package -n libsvi
-Summary:       SVI library
-Group:         Development/Libraries
-Requires:      libfeedback = %{version}-%{release}
-
-%description -n libsvi
-SVI library
-
-%package -n libsvi-devel
-Summary:       SVI library for (devel)
-Group:         Development/Libraries
-Requires:      libsvi = %{version}-%{release}
-
-%description -n libsvi-devel
-SVI library (devel)
-
-%package -n svi-data
-Summary:       svi resource package
-Group:         Development/Libraries
-
-%description -n svi-data
-svi resource package
-
-
-%prep
-%setup -q 
-
-%build
-cp %{SOURCE1} .
-cp %{SOURCE2} .
-cp %{SOURCE3} .
-%cmake .
-make
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-mkdir -p %{buildroot}/opt/share/svi/sound/touch
-mkdir -p %{buildroot}/opt/share/svi/sound/operation
-mkdir -p %{buildroot}/opt/share/svi/haptic/default
-mkdir -p %{buildroot}/opt/share/svi/haptic/touch
-
-%post -p /sbin/ldconfig
-
-%post -n svi-data
-ln -s %{_datadir}/svi/sound/touch/key0.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key1.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key2.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key3.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key4.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key5.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key6.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key7.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key8.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/key9.wav            /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav     /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/keysharp.wav        /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/sip.wav             /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav   /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/touch/touch.wav           /opt/share/svi/sound/touch
-ln -s %{_datadir}/svi/sound/operation/call_connect.wav         /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav      /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/charger_connection.wav   /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/fully_charged.wav        /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/list_reorder.wav         /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/lock.wav                 /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/low_battery.wav          /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/minute_minder.wav        /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/power_on.wav             /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/shutter.wav              /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav         /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/unlock.wav               /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/sound/operation/volume_control.wav       /opt/share/svi/sound/operation
-ln -s %{_datadir}/svi/haptic/default/Basic_call.tht             /opt/share/svi/haptic/default
-ln -s %{_datadir}/svi/haptic/touch/touch.tht                    /opt/share/svi/haptic/touch
-
-%postun -p /sbin/ldconfig
-
-%postun -n svi-data
-rm -rf %{_datadir}/svi/
-rm -rf /opt/share/svi/
-
-%files
-%manifest libfeedback.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libfeedback.so.*
-
-%files -n libfeedback-devel
-%defattr(-,root,root,-)
-%{_includedir}/feedback/*.h
-%{_libdir}/libfeedback.so
-%{_libdir}/pkgconfig/feedback.pc
-
-%files -n libsvi
-%manifest libsvi.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libsvi.so.*
-
-%files -n libsvi-devel
-%defattr(-,root,root-)
-%{_includedir}/svi/*.h
-%{_libdir}/libsvi.so
-%{_libdir}/pkgconfig/svi.pc
-
-%files -n svi-data
-%defattr(644,root,root,-)
-%{_datadir}/svi/*
-%defattr(666,app,app,-)
-%dir /opt/share/svi/sound/touch
-%dir /opt/share/svi/sound/operation
-%dir /opt/share/svi/haptic/default
-%dir /opt/share/svi/haptic/touch
-%manifest svi-data-sdk.manifest
index 27d8fb7..42bd753 100644 (file)
@@ -15,7 +15,6 @@ Source2:        setup-pulseaudio
 Source3:        sysconfig.sound-pulseaudio
 Source99:       baselibs.conf
 BuildRequires:  fdupes
-BuildRequires:  gdbm-devel
 BuildRequires:  intltool
 BuildRequires:  libcap-devel
 BuildRequires:  libtool
@@ -29,6 +28,7 @@ BuildRequires:  pkgconfig(x11-xcb)
 BuildRequires:  pkgconfig(xcb) >= 1.6
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(tdb)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -44,6 +44,8 @@ BuildRequires:  pkgconfig(vconf)
 %endif
 Requires:       udev >= 146
 Requires(pre):         pwdutils
+Recommends:     alsa-utils
+
 
 %description
 pulseaudio is a networked sound server for Linux, other Unix like
@@ -214,7 +216,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 # libpulse and libpulsecommon need each other - no way with as-needed
 export LD_AS_NEEDED=0
 echo "%{version}" > .tarball-version
-./bootstrap.sh
+./bootstrap.sh || :
 %configure \
         --disable-static \
         --disable-rpath \
@@ -224,11 +226,14 @@ echo "%{version}" > .tarball-version
         --enable-spolicy \
 %endif
         --enable-systemd \
+        --with-database=tdb \
         --with-system-user=pulse \
         --with-system-group=pulse \
         --with-access-group=pulse-access \
         --with-udev-rules-dir=/usr/lib/udev/rules.d \
         --disable-hal
+
+
 make %{?_smp_mflags} V=1
 
 %install
index 60e627a..ccd9a12 100644 (file)
@@ -13,6 +13,7 @@ Url:            http://weston.freedesktop.org/
 Source0:         %name-%version.tar.xz
 Source1:        weston.service
 Source2:        weston.target
+Source3:        99-chelong-quirk.rules
 BuildRequires: autoconf >= 2.64, automake >= 1.11
 BuildRequires:  gcc-c++
 BuildRequires:  expat-devel
@@ -83,6 +84,9 @@ install -m 644 %{SOURCE1} %{buildroot}%{_unitdir_user}/weston.service
 install -m 644 %{SOURCE2} %{buildroot}%{_unitdir_user}/weston.target
 ln -sf ../weston.service %{buildroot}/%{_unitdir_user}/weston.target.wants/
 
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/
+
 %pre
 getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launch
 
@@ -102,7 +106,7 @@ getent group weston-launch >/dev/null || %{_sbindir}/groupadd -o -r weston-launc
 %{_unitdir_user}/weston.service
 %{_unitdir_user}/weston.target
 %{_unitdir_user}/weston.target.wants/weston.service
-
+%{_sysconfdir}/udev/rules.d/99-chelong-quirk.rules
 
 %files devel
 %_includedir/weston/*.h
index 96e508e..4954b7b 100644 (file)
@@ -1,3 +1,4 @@
+%bcond_with wayland
 Name:       wrt
 Summary:    Web runtime
 Version:    0.8.198.3
@@ -44,11 +45,13 @@ BuildRequires:  pkgconfig(dpl-encryption)
 BuildRequires:  pkgconfig(wrt-popup-wrt-runner)
 BuildRequires:  pkgconfig(wrt-popup-ace-runner)
 BuildRequires:  pkgconfig(sysman)
-BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  pkgconfig(app2sd)
 BuildRequires:  pkgconfig(capi-system-system-settings)
+%if !%{with wayland}
+BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  osp-appfw-internal-devel
 Requires: osp-appfw
+%endif
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -86,8 +89,15 @@ wrt library development headers
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . -DDPL_LOG="ON"       \
-                -DPROJECT_VERSION=%{version} \
+        -DPROJECT_VERSION=%{version} \
          -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
+%if %{with wayland}
+         -DDECRYPT_SUPPORT=Off \
+         -DX11_SUPPORT=Off \
+%else
+         -DDECRYPT_SUPPORT=On \
+         -DX11_SUPPORT=On \
+%endif
         %{?WITH_TESTS:-DWITH_TESTS=%WITH_TESTS}
 
 make %{?jobs:-j%jobs}