diff --git a/.gitignore b/.gitignore index 0f83a90..940fe0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/qt-mobility-opensource-src-1.2.0.tar.gz -/qt-mobility-opensource-src-1.2.0-20110922.tar.xz /qt-mobility-opensource-src-1.2.2-20120224git.tar.xz +/qt-mobility-opensource-src-1.2.2-169da60c.tar.xz diff --git a/qt-mobility.spec b/qt-mobility.spec index 60b3344..7c2cca0 100644 --- a/qt-mobility.spec +++ b/qt-mobility.spec @@ -2,19 +2,21 @@ # options #define examples 1 -%define snap 20120224git +%define git_long 169da60c8f657b3b61309c0a570d296107181411 +%define git_short 169da60c +%define snap 20140317 Name: qt-mobility Summary: Qt Mobility Framework Version: 1.2.2 -Release: 0.9.%{snap}%{?dist} +Release: 0.10.%{snap}git%{git_short}%{?dist} License: LGPLv2 with exceptions URL: http://qt.nokia.com/products/qt-addons/mobility %if 0%{?snap:1} # git clone git://gitorious.org/qt-mobility/qt-mobility.git -# cd qt-mobility; git archive --prefix=qt-mobility-opensource-src-1.2.0/ master | xz -9 > qt-mobility-opensources-src-1.2.0-20110922.tar.xz -Source0: qt-mobility-opensource-src-%{version}-%{snap}.tar.xz +# cd qt-mobility; git archive --prefix=qt-mobility-opensource-src-%{version}/ %{git_long} | xz -9 > qt-mobility-opensources-src-%{version}-%{git_short}.tar.xz +Source0: qt-mobility-opensource-src-%{version}-%{git_short}.tar.xz %else Source0: http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-%{version}.tar.gz %endif @@ -26,8 +28,8 @@ Provides: qt4-mobility%{?_isa} = %{version}-%{release} Patch50: qt-mobility-opensource-src-1.2.0-translationsdir.patch # add pkgconfig for linux-* platforms too, Requires.private: QtCore Patch51: qt-mobility-opensource-src-1.2.2-pkgconfig.patch -# gcc 4.7, missing unistd.h for getppid -Patch52: qt-mobility-opensource-src-1.2.0-include-unistdh.patch +# fix ftbfs in sensors doc +Patch52: qt-mobility-opensource-src-1.2.2-sensors_qtbfs.patch # dso Patch53: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch @@ -68,11 +70,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt4-devel Provides: qt4-mobility-devel = %{version}-%{release} Provides: qt4-mobility-devel%{?_isa} = %{version}-%{release} -Provides: %{name}-messaging-devel = %{version}-%{release} Provides: %{name}-bearer-devel = %{version}-%{release} Provides: %{name}-versit-devel = %{version}-%{release} Provides: %{name}-contacts-devel = %{version}-%{release} Provides: %{name}-location-devel = %{version}-%{release} +Provides: %{name}-messaging-devel = %{version}-%{release} Provides: %{name}-multimedia-devel = %{version}-%{release} Provides: %{name}-publishsubscribe-devel = %{version}-%{release} Provides: %{name}-sensors-devel = %{version}-%{release} @@ -101,7 +103,7 @@ rm -r src/3rdparty/proj %patch50 -p1 -b .translationsdir %patch51 -p1 -b .pkgconfig -%patch52 -p1 -b .include-unistdh +%patch52 -p1 -b .sensors_qtbfs %patch53 -p1 -b .pulseaudio_lib @@ -232,6 +234,9 @@ chrpath --delete %{buildroot}%{_qt4_importdir}/*/*/*.so ||: %changelog +* Mon Apr 28 2014 Rex Dieter 1.2.2-0.10.20140317git169da60c +- fresh snapshot + * Mon Apr 28 2014 Rex Dieter 1.2.2-0.9.20120224git - .spec cleanup, pkgconfig: +Requires.private: QtCore diff --git a/sources b/sources index 9250ab2..a732f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ed836f6c7c436adfe2e5e33855ef844 qt-mobility-opensource-src-1.2.2-20120224git.tar.xz +95ebc1a0a331ebcc9d185faa5ee20388 qt-mobility-opensource-src-1.2.2-169da60c.tar.xz