Accepting request 130083 from home:bruno_friedmann:branches:Application:Geo

This is a start to clean up a bit qgis.spec.

OBS-URL: https://build.opensuse.org/request/show/130083
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=155
This commit is contained in:
Dirk Stoecker 2012-08-06 15:41:04 +00:00 committed by Git OBS Bridge
parent c9126fa1be
commit d865bc1651
2 changed files with 29 additions and 10 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Aug 5 12:59:40 UTC 2012 - bruno@ioda-net.ch
- cleaning spec : fix licence, Groups
- add multi-core building make -j but let %jobs as parameter
this divide by almost a factor 2 the build on obs (2200ms versus 4200ms)
-------------------------------------------------------------------
Sun Jun 24 10:23:50 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org>

View File

@ -5,16 +5,19 @@
Name: qgis
Version: 1.8.0
Release: 1
License: GPL
License: GPL-2.0
Summary: Quantum GIS (QGIS) is a Geographic Information System (GIS)
Url: http://www.qgis.org/
# This one doesn't exist it should be created/requested or replaced by
# Productivity/Graphics/Visualization/Other
# Productivity/Scientific/Other
# marble use Amusements/Teaching/Other, well not a Amusement for sure.
Group: Applications/GIS
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.rpmlintrc
Requires: libgdal1 >= 1.6.0
Requires: libgeos >= 2
Packager: Otto Dassau <dassau@gbd-consult.de>
%if 0%{?suse_version} > 1030
BuildRequires: sqlite-devel >= 3.5
Requires: sqlite >= 3.5
@ -39,7 +42,14 @@ BuildRequires: python-qt4
BuildRequires: python-sip
%endif
BuildRequires: -post-build-checks
BuildRequires: FastCGI-devel bison flex grass grass-devel gsl-devel libproj-devel txt2tags
BuildRequires: FastCGI-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: grass
BuildRequires: grass-devel
BuildRequires: gsl-devel
BuildRequires: libproj-devel
BuildRequires: txt2tags
BuildRequires: cmake >= 2.4
BuildRequires: gsl >= 1.6
BuildRequires: libQtWebKit-devel >= 4.3
@ -54,11 +64,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package devel
Summary: Development Libraries for the Quantum GIS development branch 1
Group: Development/Libraries
Group: Development/Libraries/C and C++
Requires: qgis = %{version}
%package plugin-grass
Summary: GRASS Support Libraries for Quantum GIS development branch 1
# This one doesn't exist it should be created/requested or replaced by
# Productivity/Graphics/Visualization/Other
Group: Applications/GIS
Requires: grass
Requires: qgis = %{version}
@ -94,7 +106,7 @@ export PATH=$PATH:$QTDIR/bin
cd ..
mkdir temp
cd temp
# could we strip now the build for <1030?
cmake -Wno-dev %{intsq} \
-D CMAKE_INSTALL_PREFIX=%{_prefix} \
-D CMAKE_BUILD_TYPE="Release" \
@ -114,14 +126,14 @@ cmake -Wno-dev %{intsq} \
../%{name}-%{version}/
# add path to find libgdal.so
#find ./ -iname build.make -exec sed -i 's#/libgdal.so#/usr/%{lib}/libgdal.so#' {} \;
#find ./ -iname build.make -exec sed -i 's#/libgdal.so#/usr/%%{lib}/libgdal.so#' {} \;
#echo "for 'make' run first:"
export QTDIR=%{_prefix}
#echo "export PATH=$PATH:$QTDIR/bin"
export PATH=$PATH:$QTDIR/bin
make
#use multi-core & let that optionnal if jobs is specified as meta
make %{?jobs:-j%{jobs}}
%install
cd ../temp
@ -162,8 +174,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)