dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Rebuild for GRASS 7, correct dependency on libgsl

Browse Source 
- Remove Requires-filtering, hiding the dependency on libgsl
This commit is contained in:
Volker Fröhlich 2016-03-17 00:45:03 +01:00
parent be56a2bbee
commit 0317f09a05
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qgis.spec
View File

@ -15,7 +15,7 @@
Name: qgis Name: qgis
Version: 2.14.0 Version: 2.14.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -97,13 +97,11 @@ Requires: gpsbabel
# We don't want to provide private Python extension libs # We don't want to provide private Python extension libs
%if (0%{?fedora} || 0%{?rhel} > 6) %if (0%{?fedora} || 0%{?rhel} > 6)
%global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ %global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%global __requires_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%endif %endif
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
%{?filter_setup: %{?filter_setup:
%filter_provides_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ %filter_provides_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%filter_requires_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%filter_setup %filter_setup
} }
%endif %endif
@ -216,7 +214,7 @@ gzip ChangeLog
-D WITH_BINDINGS:BOOL=TRUE \ -D WITH_BINDINGS:BOOL=TRUE \
-D MAPSERVER_SKIP_ECW=TRUE \ -D MAPSERVER_SKIP_ECW=TRUE \
-D WITH_GRASS:BOOL=TRUE \ -D WITH_GRASS:BOOL=TRUE \
-D WITH_GRASS6:BOOL=TRUE \ -D WITH_GRASS7:BOOL=TRUE \
-D GRASS_PREFIX=%{_libdir}/grass \ -D GRASS_PREFIX=%{_libdir}/grass \
-D WITH_MAPSERVER:BOOL=TRUE \ -D WITH_MAPSERVER:BOOL=TRUE \
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
@ -408,6 +406,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Wed Mar 16 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-3
- Build with Grass 7
- Remove Requires-filtering, hiding the dependency on libgsl
* Wed Mar 9 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-2 * Wed Mar 9 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-2
- Add patch for upstream issue #14402 (MSSQL) - Add patch for upstream issue #14402 (MSSQL)