diff --git a/.gitignore b/.gitignore index b122d40..0f83a90 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /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 diff --git a/qt-mobility.spec b/qt-mobility.spec index 067c2c1..a1848d6 100644 --- a/qt-mobility.spec +++ b/qt-mobility.spec @@ -2,11 +2,11 @@ # options #define examples 1 -%define snap 20110922 +%define snap 20120224git Name: qt-mobility -Version: 1.2.0 -Release: 9.%{snap}%{?dist} +Version: 1.2.2 +Release: 0.1.%{snap}%{?dist} Summary: Qt Mobility Framework Group: System Environment/Libraries License: LGPLv2 with exceptions @@ -14,7 +14,7 @@ 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-1.2.0-%{snap}.tar.xz +Source0: qt-mobility-opensource-src-%{version}-%{snap}.tar.xz %else Source0: http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-%{version}.tar.gz %endif @@ -29,10 +29,13 @@ Patch50: qt-mobility-opensource-src-1.2.0-translationsdir.patch Patch51: qt-mobility-opensource-src-1.2.0-pkgconfig.patch # gcc 4.7, missing unistd.h for getppid Patch52: qt-mobility-opensource-src-1.2.0-include-unistdh.patch +# dso +Patch53: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch +# -fpermissive hack around failed bluez checks +# see also https://bugzilla.redhat.com/show_bug.cgi?id=797266 +Patch54: qt-mobility-opensource-src-1.2.2-bluez_gcc47.patch ## upstream patches -# double-check if this is still required -- Rex -Patch101: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch BuildRequires: chrpath BuildRequires: pkgconfig(alsa) @@ -101,7 +104,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %patch50 -p1 -b .translationsdir %patch51 -p1 -b .pkgconfig %patch52 -p1 -b .include-unistdh -%patch101 -p1 -b .pulseaudio_lib +%patch53 -p1 -b .pulseaudio_lib +#patch54 -p1 -b .bluez_gcc47 %build @@ -242,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 24 2012 Rex Dieter 1.2.2-0.1.20120224git +- 1.2.2 20120224git snapshot + * Fri Feb 24 2012 Rex Dieter 1.2.0-9.20110922 - build in release mode diff --git a/sources b/sources index cc05fb2..9250ab2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ebeffc0e51f9d406dd9cf9780c136f5 qt-mobility-opensource-src-1.2.0-20110922.tar.xz +2ed836f6c7c436adfe2e5e33855ef844 qt-mobility-opensource-src-1.2.2-20120224git.tar.xz