[meego-commits] 6649: Changes to devel:ux:handset/meego-handset-dialer

[Fathi Boudra]

Hi,
I have made the following changes to meego-handset-dialer in project devel:ux:handset. Please review and accept ASAP.

Thank You,
Fathi Boudra

[This message was auto-generated]

---

Request #6649:

  submit:   home:boudra:branches:devel:ux:handset/meego-handset-dialer(r2)(cleanup) -> devel:ux:handset/meego-handset-dialer


Message:
    * Sun Aug 15 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.1.11
- Fix meego-packaging-tools path in Makefile (changed since 0.5.1)
- Remove INSTALL_ROOT export (not needed anymore)
- Remove Configure setting from yaml file (not needed with qmake builder)
- Remove temporary_build_fix.patch (not needed anymore)
- Add use_qtcontacts_pkgconfig.patch to get QtContacts header directory

State:   new          2010-08-15T04:26:38 boudra
Comment: None



changes files:
--------------
--- meego-handset-dialer.changes
+++ meego-handset-dialer.changes
@@ -0,0 +1,7 @@
+* Sun Aug 15 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.1.11
+- Fix meego-packaging-tools path in Makefile (changed since 0.5.1)
+- Remove INSTALL_ROOT export (not needed anymore)
+- Remove Configure setting from yaml file (not needed with qmake builder)
+- Remove temporary_build_fix.patch (not needed anymore)
+- Add use_qtcontacts_pkgconfig.patch to get QtContacts header directory
+

old:
----
  temporary_build_fix.patch

new:
----
  use_qtcontacts_pkgconfig.patch

spec files:
-----------
--- meego-handset-dialer.spec
+++ meego-handset-dialer.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
 # 
 # >> macros
 # << macros
@@ -15,12 +15,12 @@
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  meego-handset-dialer.yaml
 Patch0:     skip-unused-interface.patch
-Patch1:     temporary_build_fix.patch
+Patch1:     use_qtcontacts_pkgconfig.patch
 Requires:   ofono
 Requires:   voicecallhistory
 Requires:   meego-handset-dialer-branding
 BuildRequires:  pkgconfig(QtOpenGL)
-BuildRequires:  pkgconfig(QtContacts)
+BuildRequires:  pkgconfig(QtContacts) >= 1.0.2
 BuildRequires:  pkgconfig(meegotouch)
 BuildRequires:  pkgconfig(qttracker)
 BuildRequires:  libseaside-devel >= 0.0.26
@@ -48,7 +48,7 @@
 
 # skip-unused-interface.patch
 %patch0 -p1
-# temporary_build_fix.patch
+# use_qtcontacts_pkgconfig.patch
 %patch1 -p1
 # >> setup
 # << setup
@@ -66,7 +66,6 @@
 %install
 rm -rf %{buildroot}
 # >> install pre
-export INSTALL_ROOT=%{buildroot}
 # << install pre
 %make_install INSTALL_ROOT=%{buildroot}
 

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

++++++ Makefile
--- Makefile
+++ Makefile
@@ -2,4 +2,4 @@
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
 
-include /usr/share/packaging-tools/Makefile.common
+include /usr/share/meego-packaging-tools/Makefile.common

++++++ meego-handset-dialer.yaml
--- meego-handset-dialer.yaml
+++ meego-handset-dialer.yaml
@@ -9,9 +9,8 @@
     - "%{name}-%{version}.tar.bz2"
 Patches:
     - skip-unused-interface.patch
-    - temporary_build_fix.patch
+    - use_qtcontacts_pkgconfig.patch
 Description: MeeGo Touch Framework based Dialer Application
-
 Requires:
     - ofono
     - voicecallhistory
@@ -20,19 +19,17 @@
     - libseaside-devel >= 0.0.26
 PkgConfigBR:
     - QtOpenGL
-    - QtContacts
+    - QtContacts >= 1.0.2
     - meegotouch
     - qttracker
 Provides:
     - dialer
-Configure: none
 UseAsNeeded: false 
 Builder: qmake
 Files:
 - "%{_bindir}/dialer"
 - "%{_datadir}/dbus-1/services/dialer.service"
 - "%{_datadir}/applications/dialer.desktop"
-
 SubPackages:
     - Name: branding-upstream
       Summary: MeeGo dialer default theme files

++++++ use_qtcontacts_pkgconfig.patch (new)
--- use_qtcontacts_pkgconfig.patch
+++ use_qtcontacts_pkgconfig.patch
+Description: use QtContacts pkgconfig
+Author: Fathi Boudra <fathi.boudra at nokia.com>
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -2,7 +2,7 @@ include (../common.pri)
+ TEMPLATE = app
+ QT += dbus opengl
+ CONFIG += qdbus mobility
+-PKGCONFIG += QtNetwork
++PKGCONFIG += QtNetwork QtContacts
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+ MGEN_OUTDIR = .gen

++++++ deleted files:
--- temporary_build_fix.patch