Accepting request 125870 from home:tzotsos:Application:Geo
update to 1.8.0 works now OBS-URL: https://build.opensuse.org/request/show/125870 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=154
This commit is contained in:
Angelos Tzotsos
Git OBS Bridge
parent
88a09babe0
commit
c9126fa1be
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 24 10:23:50 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org>
|
||||
|
||||
- fixed some build issues for 1.8.0
|
||||
- changed to external CMake build
|
||||
- enabled rpath linking
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 19 12:32:28 UTC 2012 - dassau@gbd-consult.de
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
addFilter("devel-file-in-non-devel-package .*/usr/lib/libqgis*.*")
|
||||
addFilter("devel-file-in-non-devel-package .*/usr/lib64/libqgis*.*")
|
||||
addFilter("arch-dependent-file-in-usr-share .*/usr/share/qgis/python/qgis/.*")
|
||||
|
||||
|
||||
45
qgis.spec
45
qgis.spec
@ -19,17 +19,14 @@ Packager: Otto Dassau <dassau@gbd-consult.de>
|
||||
BuildRequires: sqlite-devel >= 3.5
|
||||
Requires: sqlite >= 3.5
|
||||
%endif
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: libspatialindex-devel
|
||||
BuildRequires: libspatialindex0
|
||||
BuildRequires: libexpat-devel fdupes python-devel libspatialindex-devel libspatialindex0
|
||||
BuildRequires: qwt-devel >= 5
|
||||
Requires: libqwt5
|
||||
Requires: gpsbabel
|
||||
Requires: gsl >= 1.6
|
||||
Requires: libqt4 >= 4.3
|
||||
Requires: postgresql >= 8
|
||||
Requires: postgresql-libs >= 8
|
||||
#Requires: libqwt5
|
||||
#Requires: gpsbabel
|
||||
#Requires: gsl >= 1.6
|
||||
#Requires: libqt4 >= 4.3
|
||||
#Requires: postgresql >= 8
|
||||
#Requires: postgresql-libs >= 8
|
||||
Requires: python-gdal
|
||||
Requires: python-qt4
|
||||
Requires: python-sip
|
||||
@ -42,22 +39,15 @@ BuildRequires: python-qt4
|
||||
BuildRequires: python-sip
|
||||
%endif
|
||||
BuildRequires: -post-build-checks
|
||||
BuildRequires: FastCGI-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: FastCGI-devel bison flex grass grass-devel gsl-devel libproj-devel txt2tags
|
||||
BuildRequires: cmake >= 2.4
|
||||
BuildRequires: flex
|
||||
BuildRequires: grass
|
||||
BuildRequires: grass-devel
|
||||
BuildRequires: gsl >= 1.6
|
||||
BuildRequires: gsl-devel
|
||||
BuildRequires: libQtWebKit-devel >= 4.3
|
||||
BuildRequires: libgdal-devel >= 1.6.0
|
||||
BuildRequires: libgeos-devel >= 2
|
||||
BuildRequires: libproj-devel
|
||||
BuildRequires: libqt4-devel >= 4.3
|
||||
BuildRequires: libqt4-qt3support >= 4.3
|
||||
BuildRequires: postgresql-devel >= 8
|
||||
BuildRequires: txt2tags
|
||||
BuildRequires: update-desktop-files
|
||||
Obsoletes: qgis10
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -101,8 +91,13 @@ export PATH=$PATH:$QTDIR/bin
|
||||
%define lib lib
|
||||
%endif
|
||||
|
||||
cd ..
|
||||
mkdir temp
|
||||
cd temp
|
||||
|
||||
cmake -Wno-dev %{intsq} \
|
||||
-D CMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-D CMAKE_BUILD_TYPE="Release" \
|
||||
-D GRASS_PREFIX=/opt/grass\
|
||||
-D QGIS_LIB_SUBDIR=%{lib} \
|
||||
-D WITH_BINDINGS=TRUE \
|
||||
@ -111,12 +106,12 @@ cmake -Wno-dev %{intsq} \
|
||||
-D QGIS_PLUGIN_SUBDIR=%{lib}/qgis \
|
||||
-D QGIS_MANUAL_SUBDIR=share/man \
|
||||
-D QWT_INCLUDE_DIR=/usr/include/qwt5 \
|
||||
-D CMAKE_SKIP_RPATH=ON \
|
||||
-D CMAKE_SKIP_RPATH=OFF \
|
||||
%if 0%{?suse_version} <= 1030
|
||||
-D WITH_INTERNAL_SQLITE3=TRUE \
|
||||
-D SQLITE3_INCLUDE_DIR=%{buildroot}/src/core/sqlite3 \
|
||||
%endif
|
||||
.
|
||||
../%{name}-%{version}/
|
||||
|
||||
# add path to find libgdal.so
|
||||
#find ./ -iname build.make -exec sed -i 's#/libgdal.so#/usr/%{lib}/libgdal.so#' {} \;
|
||||
@ -126,9 +121,10 @@ export QTDIR=%{_prefix}
|
||||
#echo "export PATH=$PATH:$QTDIR/bin"
|
||||
export PATH=$PATH:$QTDIR/bin
|
||||
|
||||
make %{_smp_mflags}
|
||||
make
|
||||
|
||||
%install
|
||||
cd ../temp
|
||||
%makeinstall
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
@ -140,6 +136,8 @@ ln -s ../%{name}/images/icons/qgis-icon.png \
|
||||
# Do not update .desktop files
|
||||
%suse_update_desktop_file -n %{name}
|
||||
|
||||
%fdupes -s %{buildroot}
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
@ -155,6 +153,7 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
%{_prefix}/lib/qgis/qgis_help
|
||||
%{_prefix}/lib/qgis/crssync
|
||||
%exclude %{_libdir}/libqgisgrass.so
|
||||
%exclude %{_libdir}/libqgisgrass.so.%{version}
|
||||
%exclude %{_libdir}/qgis/libgrass*
|
||||
@ -163,8 +162,8 @@ rm -rf %{buildroot}
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/qgis/*
|
||||
%exclude %{_prefix}/lib/debug/*
|
||||
%exclude %{_prefix}/lib/debug/.build-id/*
|
||||
##%exclude %{_prefix}/lib/debug/*
|
||||
##%exclude %{_prefix}/lib/debug/.build-id/*
|
||||
|
||||
%files plugin-grass
|
||||
%defattr(644,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user