From 7ac027568ab2f3c8adb6e77278b533f7f8de5a95 Mon Sep 17 00:00:00 2001
From: Jaroslav Reznik <jreznik@redhat.com>
Date: Fri, 13 May 2011 17:04:20 +0200
Subject: [PATCH] 1.2.0, adds QtConnectivity

---
 .gitignore                                           |  2 +-
 ...bility-opensource-src-1.1.0-translationsdir.patch | 11 -----------
 ...bility-opensource-src-1.2.0-translationsdir.patch | 12 ++++++++++++
 qt-mobility.spec                                     |  9 +++++++--
 sources                                              |  2 +-
 5 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 100644 qt-mobility-opensource-src-1.1.0-translationsdir.patch
 create mode 100644 qt-mobility-opensource-src-1.2.0-translationsdir.patch

diff --git a/.gitignore b/.gitignore
index ef5f2ec..227e708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/qt-mobility-opensource-src-1.1.3.tar.gz
+/qt-mobility-opensource-src-1.2.0.tar.gz
diff --git a/qt-mobility-opensource-src-1.1.0-translationsdir.patch b/qt-mobility-opensource-src-1.1.0-translationsdir.patch
deleted file mode 100644
index 7808334..0000000
--- a/qt-mobility-opensource-src-1.1.0-translationsdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up qt-mobility-opensource-src-1.1.0/translations/translations.pro.translationsdir qt-mobility-opensource-src-1.1.0/translations/translations.pro
---- qt-mobility-opensource-src-1.1.0/translations/translations.pro.translationsdir	2010-11-01 01:36:10.000000000 -0500
-+++ qt-mobility-opensource-src-1.1.0/translations/translations.pro	2010-12-08 11:29:30.007096486 -0600
-@@ -97,6 +97,6 @@ isEmpty(vcproj) {
- }
- 
- qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtmobility_,.qm)
--qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
-+qmfiles.path = $$[QT_INSTALL_TRANSLATIONS]
- qmfiles.CONFIG += no_check_exist
- INSTALLS += qmfiles
diff --git a/qt-mobility-opensource-src-1.2.0-translationsdir.patch b/qt-mobility-opensource-src-1.2.0-translationsdir.patch
new file mode 100644
index 0000000..8b3c29c
--- /dev/null
+++ b/qt-mobility-opensource-src-1.2.0-translationsdir.patch
@@ -0,0 +1,12 @@
+diff -up qt-mobility-opensource-src-1.2.0/translations/translations.pro.translationsdir qt-mobility-opensource-src-1.2.0/translations/translations.pro
+--- qt-mobility-opensource-src-1.2.0/translations/translations.pro.translationsdir	2011-05-10 10:06:16.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/translations/translations.pro	2011-05-13 16:35:38.646709799 +0200
+@@ -102,7 +102,7 @@ qmfiles.files = $$prependAll(LANGUAGES, 
+ meego|maemo6 {
+     qmfiles.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
+ } else {
+-    qmfiles.path = $${QT_MOBILITY_PREFIX}/translations
++    qmfiles.path = $$[QT_INSTALL_TRANSLATIONS]
+ }
+ qmfiles.CONFIG += no_check_exist
+ INSTALLS += qmfiles
diff --git a/qt-mobility.spec b/qt-mobility.spec
index b153472..5c75d38 100644
--- a/qt-mobility.spec
+++ b/qt-mobility.spec
@@ -3,7 +3,7 @@
 #define examples 1 
 
 Name:    qt-mobility
-Version: 1.1.3
+Version: 1.2.0
 Release: 1%{?dist}
 Summary: Qt Mobility Framework
 Group:   System Environment/Libraries
@@ -16,7 +16,7 @@ Provides: qt4-mobility = %{version}-%{release}
 Provides: qt4-mobility%{?_isa} = %{version}-%{release}
 
 ## upstreamable patches
-Patch50: qt-mobility-opensource-src-1.1.0-translationsdir.patch
+Patch50: qt-mobility-opensource-src-1.2.0-translationsdir.patch
 
 ## upstream patches
 Patch101: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
@@ -134,6 +134,7 @@ rm -rf %{buildroot}
 %doc changes*
 %{_qt4_libdir}/libQtBearer.so.1*
 %{_qt4_libdir}/libQtContacts.so.1*
+%{_qt4_libdir}/libQtConnectivity.so.1*
 %{_qt4_libdir}/libQtFeedback.so.1*
 %{_qt4_libdir}/libQtGallery.so.1*
 %{_qt4_libdir}/libQtLocation.so.1*
@@ -152,6 +153,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/icheck
+%{_bindir}/ndefhandlergen
 %{_bindir}/qcrmlgen
 %{_bindir}/servicedbgen
 %{_bindir}/servicefw
@@ -217,6 +219,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 13 2011 Jaroslav Reznik <jreznik@redhat.com> 1.2.0-1
+- 1.2.0
+
 * Mon May 09 2011 Jaroslav Reznik <jreznik@redhat.com> 1.1.3-1
 - 1.1.3
 
diff --git a/sources b/sources
index deba216..e37d950 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bf0cccd007c98a35aad94436538124f  qt-mobility-opensource-src-1.1.3.tar.gz
+ea5db5a8d3dd4709c2926dceda646bd8  qt-mobility-opensource-src-1.2.0.tar.gz