diff --git a/qgis-1.5.0-qwt.patch b/qgis-1.5.0-qwt.patch deleted file mode 100644 index 80c7065..0000000 --- a/qgis-1.5.0-qwt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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" diff --git a/qgis-1.5.0-sip411.patch b/qgis-1.5.0-sip411.patch deleted file mode 100644 index 4422dfd..0000000 --- a/qgis-1.5.0-sip411.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- qgis-1.5.0/python/core/conversions.sip 2010-04-20 14:25:42.000000000 +0200 -+++ qgis-1.5.0-sip411/python/core/conversions.sip 2010-09-11 23:37:45.828329803 +0200 -@@ -263,61 +263,6 @@ - }; - - -- -- --%MappedType QSet --{ --%TypeHeaderCode --#include --#if (SIP_VERSION >= 0x040900) --#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) --#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) --#endif --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- QSet::iterator it = sipCpp->begin(); -- for (int i = 0; it != sipCpp->end(); ++it, ++i) -- { -- PyObject *tobj; -- -- if ((tobj = PyInt_FromLong(*it)) == NULL) -- { -- Py_DECREF(l); -- return NULL; -- } -- PyList_SET_ITEM(l, i, tobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- return PyList_Check(sipPy); -- -- QSet *qset = new QSet; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- qset->insert(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); -- } -- -- *sipCppPtr = qset; -- return sipGetState(sipTransferObj); --%End -- --}; -- -- - template - %MappedType QSet - { diff --git a/qgis.spec b/qgis.spec index dfe5f00..bb7cab6 100644 --- a/qgis.spec +++ b/qgis.spec @@ -3,21 +3,20 @@ %endif Name: qgis -Version: 1.5.0 -Release: 6%{?dist} +Version: 1.6.0 +Release: 1%{?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 -Patch2: qgis-1.5.0-sip411.patch BuildRequires: cmake BuildRequires: flex bison @@ -38,16 +37,24 @@ 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. @@ -77,19 +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 -%patch2 -p1 -b .sip411 # 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 @@ -103,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 \ @@ -114,21 +121,16 @@ GRASS_PREFIX=%{_libdir} . # Parallel make leads to race conditions with PYQT4_WRAP_UI -#make %{?_smp_mflags} -make +# But let's give it a try again! +make %{?_smp_mflags} +#make %install 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 @@ -151,11 +153,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} @@ -179,6 +176,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 @@ -224,6 +224,15 @@ rm -rf %{buildroot} %{python_sitearch}/%{name} %changelog + +* Thu Nov 11 2010 Volker Fröhlich - 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 @@ -277,7 +286,7 @@ rm -rf %{buildroot} - Changed description for the subpackages python and grass * Wed Jun 24 2010 Volker Fröhlich - 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