rpms/qgis/devel qgis-1.5.0-grass.patch, NONE, 1.1 qgis-1.5.0-qwt.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 qgis.spec, 1.45, 1.46 sources, 1.10, 1.11 qgis-1.4.0-QVariant.patch, 1.1, NONE qgis-1.4.0-asslibqgis.patch, 1.1, NONE qgis-1.4.0-asslibqgisv.patch, 1.1, NONE qgis-1.4.0-fieldcalc.patch, 1.1, NONE qgis-1.4.0-grass.patch, 1.1, NONE qgis-1.4.0-qt47.patch, 1.1, NONE qgis-1.4.0-savebutton.patch, 1.1, NONE qgis-1.4.0-sip410.patch, 1.1, NONE qgis-1.4.0-vectorcrs.patch, 1.1, NONE
Volker Fröhlich
volter at fedoraproject.org
Sat Jul 17 14:56:52 UTC 2010
Author: volter
Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25157
Modified Files:
.cvsignore qgis.spec sources
Added Files:
qgis-1.5.0-grass.patch qgis-1.5.0-qwt.patch
Removed Files:
qgis-1.4.0-QVariant.patch qgis-1.4.0-asslibqgis.patch
qgis-1.4.0-asslibqgisv.patch qgis-1.4.0-fieldcalc.patch
qgis-1.4.0-grass.patch qgis-1.4.0-qt47.patch
qgis-1.4.0-savebutton.patch qgis-1.4.0-sip410.patch
qgis-1.4.0-vectorcrs.patch
Log Message:
Updated to version 1.5.0
qgis-1.5.0-grass.patch:
FindGRASS.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE qgis-1.5.0-grass.patch ---
--- qgis-1.5.0/cmake/FindGRASS.cmake 2010-06-20 19:09:21.151964000 +0200
+++ qgis-1.5.0-grass/cmake/FindGRASS.cmake 2010-07-12 09:31:16.551002521 +0200
@@ -17,7 +17,7 @@
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
SET(LIB_PATH NOTFOUND)
- FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
+ FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib)
IF (LIB_PATH)
SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})
qgis-1.5.0-qwt.patch:
FindQWT.cmake | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE qgis-1.5.0-qwt.patch ---
--- qgis-1.5.0-qwt/cmake/FindQWT.cmake 2010-07-03 01:46:21.423273337 +0200
+++ qgis-1.5.0/cmake/FindQWT.cmake 2010-07-03 02:24:07.850647802 +0200
@@ -17,6 +17,7 @@
#MESSAGE("Searching for QWT")
FIND_PATH(QWT_INCLUDE_DIR qwt.h
/usr/include
+ /usr/include/qwt
/usr/include/qwt-qt4
/usr/local/include
"$ENV{LIB_DIR}/include"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 11 Jul 2010 23:32:19 -0000 1.10
+++ .cvsignore 17 Jul 2010 14:56:51 -0000 1.11
@@ -1 +1 @@
-qgis_1.4.0.tar.gz
+qgis_1.5.0.tar.gz
Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- qgis.spec 16 Jul 2010 16:22:59 -0000 1.45
+++ qgis.spec 17 Jul 2010 14:56:52 -0000 1.46
@@ -3,8 +3,8 @@
%endif
Name: qgis
-Version: 1.4.0
-Release: 9%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@@ -13,26 +13,10 @@ URL: http://www.qgis.org/
Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
Source1: %{name}.desktop
-# Fix sip version, so it works with sip 4.10
-# Already fixed in upcoming version http://trac.osgeo.org/qgis/ticket/2446
-Patch0: qgis-1.4.0-sip410.patch
-
# Fix detection problem for GRASS libraries
-Patch1: qgis-1.4.0-grass.patch
-Patch2: qgis-1.4.0-qt47.patch
-
-# Already fixed in upcoming version https://trac.osgeo.org/qgis/ticket/2879
-Patch3: qgis-1.4.0-QVariant.patch
-
-## Upstream patches
-# http://trac.osgeo.org/qgis/ticket/2542
-Patch100: qgis-1.4.0-fieldcalc.patch
-
-# http://trac.osgeo.org/qgis/ticket/2661
-Patch101: qgis-1.4.0-vectorcrs.patch
-
-# http://trac.osgeo.org/qgis/ticket/2670
-Patch102: qgis-1.4.0-asslibqgisv.patch
+# 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
@@ -47,6 +31,8 @@ BuildRequires: sqlite-devel
BuildRequires: chrpath
BuildRequires: desktop-file-utils
BuildRequires: qt-devel
+BuildRequires: qwt-devel
+BuildRequires: PyQwt-devel
BuildRequires: sip-devel > 4.7
BuildRequires: python-devel
BuildRequires: PyQt4-devel
@@ -99,25 +85,12 @@ Python integration and plugins for QGIS.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .sip410
-%patch1 -p1 -b .grass
-%patch2 -p1 -b .qt47
-%patch3 -p1 -b .QVariant
-%patch100 -p1 -b .fieldcalc
-%patch101 -p1 -b .vectorcrs
-%patch102 -p1 -b .asslibqgis
+%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
-# Fix spurious executable bits
-# Already fixed in upcoming version
-chmod -x \
- ./src/app/legend/qgslegend.h \
- ./src/app/legend/qgslegend.cpp \
- ./src/core/composer/qgscomposershape.h \
- ./src/core/composer/qgscomposershape.cpp
-
# Remove obsolete translations
#/usr/bin/lupdate-qt4 -noobsolete -ts i18n/qgis_*.ts
@@ -215,10 +188,12 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/themes
%exclude %{_libdir}/libqgisgrass.so.%{version}
%exclude %{_libdir}/%{name}/libgrassprovider.so
+%exclude %{_libdir}/%{name}/libgrassrasterprovider.so
%exclude %{_libdir}/%{name}/libgrassplugin.so
%exclude %{_datadir}/%{name}/themes/default/grass
%exclude %{_datadir}/%{name}/themes/gis/grass
%exclude %{_datadir}/%{name}/themes/classic/grass
+%exclude %{_libdir}/%{name}/grass
%files devel
%defattr(-,root,root,-)
@@ -231,7 +206,9 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/lib%{name}grass.so.%{version}
%{_libdir}/%{name}/libgrassprovider.so
+%{_libdir}/%{name}/libgrassrasterprovider.so
%{_libdir}/%{name}/libgrassplugin.so
+%{_libdir}/%{name}/grass
%{_datadir}/%{name}/grass
%{_datadir}/%{name}/themes/default/grass
%{_datadir}/%{name}/themes/gis/grass
@@ -244,6 +221,9 @@ rm -rf %{buildroot}
%{python_sitearch}/%{name}
%changelog
+* Sat Jul 17 2010 Volker Fröhlich <volker27 at gmx.at> - 1.5.0-1
+- Updated for 1.5.0
+- Added support for qwt
* Wed Jul 14 2010 Volker Fröhlich <volker27 at gmx.at> - 1.4.0-9
- Re-added missing dependency of PyQt4 and sip for python sub-package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 11 Jul 2010 23:32:19 -0000 1.10
+++ sources 17 Jul 2010 14:56:52 -0000 1.11
@@ -1 +1 @@
-47710e7aa14c2a672c7f28457b0c956f qgis_1.4.0.tar.gz
+a198fbcd8d96f5ed5e85a814cbc8f033 qgis_1.5.0.tar.gz
--- qgis-1.4.0-QVariant.patch DELETED ---
--- qgis-1.4.0-asslibqgis.patch DELETED ---
--- qgis-1.4.0-asslibqgisv.patch DELETED ---
--- qgis-1.4.0-fieldcalc.patch DELETED ---
--- qgis-1.4.0-grass.patch DELETED ---
--- qgis-1.4.0-qt47.patch DELETED ---
--- qgis-1.4.0-savebutton.patch DELETED ---
--- qgis-1.4.0-sip410.patch DELETED ---
--- qgis-1.4.0-vectorcrs.patch DELETED ---
More information about the scm-commits
mailing list