[qgis/f14/master] Updated for 1.6
Volker Fröhlich
volter at fedoraproject.org
Thu Nov 11 18:25:01 UTC 2010
commit a2b5dc62b14d1b2da0e07cc84856141c93835d26
Author: Volker Fröhlich <volker at fedora13.(none)>
Date: Thu Nov 11 19:29:33 2010 +0100
Updated for 1.6
qgis-1.5.0-qwt.patch | 10 -------
qgis.spec | 68 +++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 46 insertions(+), 34 deletions(-)
---
diff --git a/qgis.spec b/qgis.spec
index e419f5a..5e2a343 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -3,20 +3,20 @@
%endif
Name: qgis
-Version: 1.5.0
-Release: 3%{?dist}
+Version: 1.6.0
+Release: 2%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
License: GPLv2+ with exceptions
URL: http://www.qgis.org/
-Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
+#Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
+Source0: http://qgis.org/~timlinux/src/%{name}_%{version}.tar.gz
Source1: %{name}.desktop
# Fix detection problem for GRASS libraries
# Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863
Patch0: qgis-1.5.0-grass.patch
-Patch1: qgis-1.5.0-qwt.patch
BuildRequires: cmake
BuildRequires: flex bison
@@ -30,23 +30,31 @@ BuildRequires: proj-devel
BuildRequires: sqlite-devel
BuildRequires: chrpath
BuildRequires: desktop-file-utils
-BuildRequires: qt-devel
+BuildRequires: qt4-devel
BuildRequires: qwt-devel
BuildRequires: PyQwt-devel
BuildRequires: sip-devel > 4.7
BuildRequires: python-devel
BuildRequires: PyQt4-devel
BuildRequires: qt4-webkit-devel
+BuildRequires: fcgi-devel
# grass package contains definitions needed for configure script
BuildRequires: grass, grass-devel
Requires: gpsbabel
+# Obsoletes can be dropped after F15's EOL
Obsoletes: qgis-theme-classic < 1.1
Obsoletes: qgis-theme-gis < 1.1
Obsoletes: qgis-theme-nkids < 1.1
+# We don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_setup
+}
+
%description
Quantum GIS (QGIS) is a user friendly Open Source Geographic Information
System (GIS) that runs on Linux, Unix, Mac OSX, and Windows.
@@ -76,18 +84,17 @@ GRASS plugin for Quantum GIS required to interface with the GRASS system.
Summary: Python integration and plugins for Quantum GIS
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
-Requires: gdal-python
-Requires: PyQt4
+Requires: gdal-python
+Requires: PyQt4
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
%description python
Python integration and plugins for QGIS.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%patch0 -p1 -b .grass
-%patch1 -p1 -b .qwt
# Encode man-file to utf-8
iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1
@@ -101,9 +108,11 @@ iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.con
GRASS_PREFIX=%{_libdir}
%cmake \
+ %{_cmake_skip_rpath} \
-D QGIS_LIB_SUBDIR=%{_lib} \
-D QGIS_MANUAL_SUBDIR=/share/man \
-D QGIS_PLUGIN_SUBDIR=%{_lib}/%{name} \
+ -D QGIS_CGIBIN_SUBDIR=%{_var}/www/cgi-bin \
-D WITH_BINDINGS:BOOL=TRUE \
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
-D GRASS_PREFIX=$GRASS_PREFIX \
@@ -119,14 +128,8 @@ make
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-# Qt translations shouldn't be shipped
-rm -f %{buildroot}/%{_datadir}/%{name}/i18n/qt_*.qm
-
%find_lang %{name} --with-qt
-# Remove rpath from files
-chrpath --delete \
- %{buildroot}%{python_sitearch}/%{name}/*.so
# Add executable perms to python libs so they get stripped
chmod +x %{buildroot}%{python_sitearch}/%{name}/*.so
@@ -149,11 +152,6 @@ desktop-file-install --vendor="fedora" \
--dir=%{buildroot}/%{_datadir}/applications \
%{SOURCE1}
-%check
-# The tests don't seem to work right
-# -D ENABLE_TESTS:BOOL=TRUE \
-#make -d test
-
%clean
rm -rf %{buildroot}
@@ -177,6 +175,9 @@ rm -rf %{buildroot}
%{_libdir}/lib%{name}_*.so.*
%{_libdir}/%{name}/
%{_bindir}/qgis*
+%{_var}/www/cgi-bin/admin.sld
+%{_var}/www/cgi-bin/wms_metadata.xml
+%{_var}/www/cgi-bin/qgis_mapserv.fcgi
%{_mandir}/man1/%{name}*
%dir %{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
@@ -223,8 +224,29 @@ rm -rf %{buildroot}
%changelog
-* Fri Jul 30 2010 Volker Fröhlich <volker27 at gmx.at> - 1.5.0-3
-- Added dependency for gdal-python to fulfill standard plugin's requirements
+* Thu Nov 11 2010 Volker Fröhlich <volker27 at gmx.at> - 1.6.0-2
+- Disabled smp-flags again
+
+* Thu Nov 11 2010 Volker Fröhlich <volker27 at gmx.at> - 1.6.0-1
+- Avoid rpaths in the first place
+- Dropped superfluid QWT and SIP patches
+- Dropped test section
+- Added dependency for fcgi-devel
+- Abbreviated syntax for setup macro
+- Qt translations are no longer shipped
+
+* Wed Sep 29 2010 jkeating - 1.5.0-6
+- Rebuilt for gcc bug 634757
+
+* Mon Sep 13 2010 Volker Fröhlich <volker27 at gmx.at> - 1.5.05
+- Added workaround patch for SIP 4.11, see http://trac.osgeo.org/qgis/ticket/2985
+
+* Thu Sep 09 2010 Rex Dieter <rdieter at fedoraproject.org> 1.5.0-4
+- rebuild (sip)
+- BR: qt4-devel
+
+* Fri Jul 30 2010 Volker Fröhlich <volker27 at gmx.at> - 1.5.03
+- Added dependency for gdal-python to fulfill standard plugins' requirements
* Tue Jul 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.5.0-2.py27
- one more time for python27, with feeling
@@ -266,7 +288,7 @@ rm -rf %{buildroot}
- Changed description for the subpackages python and grass
* Wed Jun 24 2010 Volker Fröhlich <volker27 at gmx.at> - 1.4.0-2
-- Grouped corresponding entries for %description and %package
+- Grouped corresponding entries for description and package macro
- Corrected swapped summaries for python- and grass-subpackage
- Set theme subpackages as obsolete
- Removed nonsensical build-requires statements from subpackages
diff --git a/sources b/sources
index 566858b..380b213 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a198fbcd8d96f5ed5e85a814cbc8f033 qgis_1.5.0.tar.gz
+cac100a4504675102dfc5520cb46fa92 qgis_1.6.0.tar.gz
More information about the scm-commits
mailing list