Use system proj instead of bundled one

https://bugzilla.redhat.com/show_bug.cgi?id=1078486
This commit is contained in:
Ville Skyttä 2014-03-19 20:54:35 +02:00
parent a35c4e31b4
commit 484ac8bf7d
1 changed files with 6 additions and 1 deletions

View File

@ -6,7 +6,7 @@
Name: qt-mobility Name: qt-mobility
Version: 1.2.2 Version: 1.2.2
Release: 0.7.%{snap}%{?dist} Release: 0.8.%{snap}%{?dist}
Summary: Qt Mobility Framework Summary: Qt Mobility Framework
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2 with exceptions License: LGPLv2 with exceptions
@ -51,6 +51,7 @@ BuildRequires: pkgconfig(NetworkManager)
BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui) pkgconfig(QtOpenGL) BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui) pkgconfig(QtOpenGL)
BuildRequires: pkgconfig(QtNetwork) >= 4.7 BuildRequires: pkgconfig(QtNetwork) >= 4.7
BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xv)
BuildRequires: proj-devel
## under review, http://bugzilla.redhat.com/626122 ## under review, http://bugzilla.redhat.com/626122
# BuildRequires: libqmf-devel >= 1.0 # BuildRequires: libqmf-devel >= 1.0
@ -103,6 +104,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q -n %{name}-opensource-src-%{version} %setup -q -n %{name}-opensource-src-%{version}
rm -r src/3rdparty/proj
%patch50 -p1 -b .translationsdir %patch50 -p1 -b .translationsdir
%patch51 -p1 -b .pkgconfig %patch51 -p1 -b .pkgconfig
@ -249,6 +251,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Wed Mar 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 1.2.2-0.8.20120224git
- Use system proj instead of bundled one
* Sat Mar 08 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.2.2-0.7.20120224git * Sat Mar 08 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.2.2-0.7.20120224git
- rebuild against fixed qt to fix -debuginfo (#1074041) - rebuild against fixed qt to fix -debuginfo (#1074041)