[meego-commits] 8218: Changes to Trunk/sensorfw

Fri Oct 8 18:22:01 UTC 2010

Hi,
I have made the following changes to sensorfw in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #8218:

  submit:   Trunk:Testing/sensorfw(r8) -> Trunk/sensorfw


Message:
    Move to Trunk

State:   new          2010-10-08T11:22:00 nashif
Comment: None



changes files:
--------------

--- sensorfw.changes
+++ sensorfw.changes
@@ -0,0 +1,12 @@
+Thu Oct 07 2010 Markus Lehtonen <markus.lehtonen at nokia.com> - 0.6.26.p.gitde0cd945
+- Version bump to git head (multiconf patch now in upstream)
+
+Thu Sep 30 2010 Markus Lehtonen <markus.lehtonen at nokia.com> - sensorfw-0.6.26.p.git45616cdb
+- Version bump to git HEAD (adds e.g. adaptors for some new Intel platforms)
+- Added device-specific config packages (should be temporary solution, until
+  device detection is implemented and working)
+
+Wed Sep 22 2010 Markus Lehtonen <markus.lehtonen at nokia.com> - 0.6.25
+- Version bump to 0.6.25
+- Introduce multiconf patch
+

old:
----
  sensorfw-0.6.19.p.git82de2729-init-fix.patch
  sensorfw-0.6.19.p.git82de2729.tar.gz

new:
----
  Makefile
  sensord-aava.conf
  sensord-cdk.conf
  sensord-n900.conf
  sensorfw-0.6.26.p.gitde0cd945.tar.gz

spec files:
-----------
--- sensorfw.spec
+++ sensorfw.spec
@@ -1,28 +1,26 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
 
 Name:       sensorfw
 Summary:    Sensor Framework
-Version:    0.6.19.p.git82de2729
+Version:    0.6.26.p.gitde0cd945
 Release:    0
 Group:      System/Libraries
 License:    LGPLv2+
 URL:        http://gitorious.org/sensorfw
 Source0:    %{name}-%{version}.tar.gz
+Source1:    sensord-n900.conf
+Source2:    sensord-aava.conf
+Source3:    sensord-cdk.conf
 Source100:  sensorfw.yaml
-Patch0:     %{name}-%{version}-init-fix.patch
 Requires:   qt
 Requires:   GConf-dbus
 Requires(post): /sbin/ldconfig
-Requires(post): /sbin/service
-Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
-Requires(postun): /sbin/service
-Requires(postun): /sbin/chkconfig
 BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(contextprovider-1.0)
@@ -69,12 +67,43 @@
 Doxygen-generated API documentation for sensord.
 
 
+%package config-n900
+Summary:    Configuration for Nokia N900
+Group:      System/Libraries
+BuildArch:    noarch
+Requires:   %{name} = %{version}-%{release}
+Provides:   sensord-config
+
+%description config-n900
+Sensorfw configuration file(s) for Nokia N900
+
+
+%package config-aava
+Summary:    Configuration for Aava
+Group:      System/Libraries
+BuildArch:    noarch
+Requires:   %{name} = %{version}-%{release}
+Provides:   sensord-config
+
+%description config-aava
+Sensorfw configuration file(s) for Aava
+
+
+%package config-cdk
+Summary:    Configuration for CDK
+Group:      System/Libraries
+BuildArch:    noarch
+Requires:   %{name} = %{version}-%{release}
+Provides:   sensord-config
+
+%description config-cdk
+Sensorfw configuration file(s) for CDK
+
+
 
 %prep
 %setup -q -n %{name}-%{version}
 
-# %{name}-%{version}-init-fix.patch
-%patch0 -p1
 # >> setup
 # << setup
 
@@ -82,7 +111,7 @@
 # >> build pre
 unset LD_AS_NEEDED
 mkdir -p builddir
-cd builddir && qmake "CONFIG+=mce_disable QMAKE_CXXFLAGS='$CFLAGS'" ../%{name}.pro
+cd builddir && qmake "CONFIG+=mce_disable keyboardcontext" "QMAKE_CXXFLAGS='$CXXLAGS'" ../%{name}.pro
 export LD_RUN_PATH=/usr/lib/sensord/
 # << build pre
 
@@ -101,6 +130,9 @@
 %make_install 
 
 # >> install post
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/50-n900.conf
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/50-aava.conf
+install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/50-cdk.conf
 # << install post
 
 
@@ -130,44 +162,73 @@
 
 
 
+
+
+
+
+
+
+
+
+
 %files
 %defattr(-,root,root,-)
+# >> files
 %attr(755,root,root)%{_sbindir}/sensord
 %{_libdir}/sensord/*.so
 %{_libdir}/*.so.*
-%config /etc/dbus-1/system.d/sensorfw.conf
-%config /etc/sensord.conf
+%config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf
+%config %{_sysconfdir}/sensorfw/sensord.conf
+%config %{_sysconfdir}/sensorfw/sensord.conf.d/90*
 %{_datadir}/contextkit/providers/com.nokia.SensorService.context
-%attr(0755,root,root) /etc/rc.d/init.d/sensord
+%attr(0755,root,root) %{_initrddir}/sensord
 %doc debian/copyright debian/README COPYING
-# >> files
 # << files
 
 
 %files devel
 %defattr(-,root,root,-)
+# >> files devel
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/sensord/*
 %{_datadir}/qt4/mkspecs/features/sensord.prf
-# >> files devel
 # << files devel
 
 %files tests
 %defattr(-,root,root,-)
+# >> files tests
 %{_libdir}/sensord/testing/*
 %attr(755,root,root)%{_datadir}/sensord-tests/*.p*
 %attr(644,root,root)%{_datadir}/sensord-tests/*.xml
+%attr(644,root,root)%{_datadir}/sensord-tests/*.conf
 %attr(755,root,root)%{_bindir}/*
 %attr(755,root,root)%{_datadir}/sensord-contextfw-tests/*.sh
 %attr(755,root,root)%{_datadir}/sensord-contextfw-tests/*.p*
 %attr(644,root,root)%{_datadir}/sensord-contextfw-tests/*.xml
-# >> files tests
 # << files tests
 
 %files doc
 %defattr(-,root,root,-)
-%attr(644,root,root)%{_defaultdocdir}/sensord/html/*
 # >> files doc
+%attr(644,root,root)%{_defaultdocdir}/sensord/html/*
 # << files doc
 
+%files config-n900
+%defattr(-,root,root,-)
+# >> files config-n900
+%config %{_sysconfdir}/%{name}/50-n900.conf
+# << files config-n900
+
+%files config-aava
+%defattr(-,root,root,-)
+# >> files config-aava
+%config %{_sysconfdir}/%{name}/50-aava.conf
+# << files config-aava
+
+%files config-cdk
+%defattr(-,root,root,-)
+# >> files config-cdk
+%config %{_sysconfdir}/%{name}/50-cdk.conf
+# << files config-cdk
+

other changes:
--------------

++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := sensorfw
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+
+include /usr/share/packaging-tools/Makefile.common

++++++ sensord-aava.conf (new)
--- sensord-aava.conf
+++ sensord-aava.conf
+# TODO: add Aava-specific configs below
+# (and/or commit to upstream default config)
+deviceId = aava

++++++ sensord-cdk.conf (new)
--- sensord-cdk.conf
+++ sensord-cdk.conf
+# TODO: add Aava-specific configs below
+# (and/or commit to upstream default config)
+deviceId = cdk

++++++ sensord-n900.conf (new)
--- sensord-n900.conf
+++ sensord-n900.conf
+# All other keys are already correctly set in default config file
+deviceId = n900

++++++ sensorfw-0.6.26.p.gitde0cd945.tar.gz (new)

++++++ sensorfw.yaml
--- sensorfw.yaml
+++ sensorfw.yaml
@@ -1,6 +1,6 @@
 Name: sensorfw
 Summary: Sensor Framework
-Version: 0.6.19.p.git82de2729
+Version: 0.6.26.p.gitde0cd945
 Release: 0
 Group: System/Libraries
 License: LGPLv2+
@@ -9,8 +9,10 @@
     Sensor Framework provides an interface to hardware sensor drivers through logical sensors. This package contains sensor framework daemon and required libraries.
 Sources:
     - "%{name}-%{version}.tar.gz"
-Patches:
-    - "%{name}-%{version}-init-fix.patch"
+    - "sensord-n900.conf"
+    - "sensord-aava.conf"
+    - "sensord-cdk.conf"
+
 Requires:
     - qt
     - GConf-dbus
@@ -29,16 +31,6 @@
 
 Configure: none
 
-Files:
-    - "%attr(755,root,root)%{_sbindir}/sensord"
-    - "%{_libdir}/sensord/*.so"
-    - "%{_libdir}/*.so.*"
-    - "%config /etc/dbus-1/system.d/sensorfw.conf"
-    - "%config /etc/sensord.conf"
-    - "%{_datadir}/contextkit/providers/com.nokia.SensorService.context"
-    - "%attr(0755,root,root) /etc/rc.d/init.d/sensord"
-    - "%doc debian/copyright debian/README COPYING"
-
 SubPackages:
     - Name: devel
       Group: Development/Libraries
@@ -47,11 +39,6 @@
       Summary: Sensor framework daemon libraries development headers
       Description: |
         Development headers for sensor framework daemon and libraries.
-      Files:
-          - "%{_libdir}/*.so"
-          - "%{_libdir}/pkgconfig/*"
-          - "%{_includedir}/sensord/*"
-          - "%{_datadir}/qt4/mkspecs/features/sensord.prf"
     - Name: tests
       Group: Development/Libraries
       Requires:
@@ -63,18 +50,33 @@
       Summary: Unit test cases for sensord
       Description: |
         Contains unit test cases for CI environment.
-      Files:
-          - "%{_libdir}/sensord/testing/*"
-          - "%attr(755,root,root)%{_datadir}/sensord-tests/*.p*"
-          - "%attr(644,root,root)%{_datadir}/sensord-tests/*.xml"
-          - "%attr(755,root,root)%{_bindir}/*"
-          - "%attr(755,root,root)%{_datadir}/sensord-contextfw-tests/*.sh"
-          - "%attr(755,root,root)%{_datadir}/sensord-contextfw-tests/*.p*"
-          - "%attr(644,root,root)%{_datadir}/sensord-contextfw-tests/*.xml"
     - Name: doc
       Group: Documentation
       Summary: API documentation for libsensord
       Description: |
         Doxygen-generated API documentation for sensord.
-      Files:
-          - "%attr(644,root,root)%{_defaultdocdir}/sensord/html/*"
+    - Name: config-n900
+      Group: System/Libraries
+      Summary: Configuration for Nokia N900
+      Description: |
+        Sensorfw configuration file(s) for Nokia N900
+      BuildArch: noarch
+      Provides:
+          - sensord-config
+    - Name: config-aava
+      Group: System/Libraries
+      Summary: Configuration for Aava
+      Description: |
+        Sensorfw configuration file(s) for Aava
+      BuildArch: noarch
+      Provides:
+          - sensord-config
+    - Name: config-cdk
+      Group: System/Libraries
+      Summary: Configuration for CDK
+      Description: |
+        Sensorfw configuration file(s) for CDK
+      BuildArch: noarch
+      Provides:
+          - sensord-config
+

++++++ deleted files:
--- sensorfw-0.6.19.p.git82de2729-init-fix.patch
--- sensorfw-0.6.19.p.git82de2729.tar.gz


