rpms/qgis/F-8 .cvsignore, 1.4, 1.5 qgis.spec, 1.13, 1.14 sources, 1.4, 1.5
Douglas E. Warner (silfreed)
fedora-extras-commits at redhat.com
Tue Aug 12 15:00:46 UTC 2008
Author: silfreed
Update of /cvs/pkgs/rpms/qgis/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5616
Modified Files:
.cvsignore qgis.spec sources
Log Message:
* Mon Aug 11 2008 Douglas E. Warner <silfreed at silfreed.net> 0.11.0-2
- building against blas and lapack instead of atlas and blas to fix missing
library calls
* Wed Jul 16 2008 Douglas E. Warner <silfreed at silfreed.net> 0.11.0-1
- update to metis 0.11.0
- remove python patch
- enabling python subpackage
- fixed executable perms on new headers/source
- stripping rpath with chrpath
- making python libs executable to get files stripped
* Fri Mar 28 2008 Douglas E. Warner <silfreed at silfreed.net> 0.10.0-2
- added patch to support cmake 2.6
* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> - 0.10.0-1
- upgraded to 0.10.0 release candidate
- removed gcc 4.3 patches
- adding devel package since libraries are now versioned
* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> - 0.9.1-5
- fix build by adding more gcc43 patches
- rebuild against grass63
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.1-4
- Autorebuild for GCC 4.3
* Mon Feb 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-4
- adding gcc43-INT_MAX-qgis-0.9.1.patch
- adding gcc43-duplicate_function_param-qgis-0.9.1.patch
- adding gcc43-memcpy-qgis-0.9.1.patch
- adding gcc43-memcpy-strtod-qgis-0.9.1.patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 29 Jan 2008 18:59:43 -0000 1.4
+++ .cvsignore 12 Aug 2008 15:00:16 -0000 1.5
@@ -1 +1 @@
-qgis-0.9.1.tar.gz
+qgis_0.11.0.tar.gz
Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-8/qgis.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qgis.spec 18 Feb 2008 16:09:05 -0000 1.13
+++ qgis.spec 12 Aug 2008 15:00:16 -0000 1.14
@@ -2,20 +2,18 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: qgis
-Version: 0.9.1
-Release: 3%{?dist}
+Version: 0.11.0
+Release: 2%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
License: GPLv2+
URL: http://qgis.org/
-Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
+Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
Source1: %{name}.desktop
-Patch0: python-site-packages-dir-0.9.1.patch
+#Patch0: qgis-0.10.0-cmake-2.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: sip
-Requires: PyQt4
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
@@ -26,11 +24,13 @@
BuildRequires: gsl-devel
BuildRequires: postgresql-devel
BuildRequires: sqlite-devel
-BuildRequires: python-devel
# grass package contains definitions needed for configure script
BuildRequires: grass, grass-devel
BuildRequires: python-devel
BuildRequires: PyQt4-devel
+BuildRequires: chrpath
+# fixing missing library calls in atlas
+BuildRequires: blas, lapack
%description
Quantum GIS (QGIS) is a user friendly Open Source Geographic Information
@@ -41,13 +41,13 @@
geotiff). QGIS supports plugins to do things like display tracks from your GPS.
-#%package devel
-#Summary: Headers and libraries for building against qgis
-#Group: Development/Libraries
-#Requires: %{name} = %{version}-%{release}
-#
-#%description devel
-#Headers and libraries for building against qgis
+%package devel
+Summary: Headers and libraries for building against qgis
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Headers and libraries for building against qgis
%package grass
@@ -60,13 +60,15 @@
GRASS plugins for qgis
-#%package python
-#Summary: python integration and plugins
-#Group: Applications/Engineering
-#Requires: %{name} = %{version}-%{release}
-#
-#%description python
-#python integration and plugins
+%package python
+Summary: Python integration and plugins for qgis
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+Requires: sip
+Requires: PyQt4
+
+%description python
+Python integration and plugins for qgis
%package theme-nkids
@@ -79,8 +81,15 @@
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}_%{version}
+#%patch0 -p1
+
+# fix spurious executable bits
+%{__chmod} -x \
+ ./src/app/legend/qgslegend.h \
+ ./src/app/legend/qgslegend.cpp \
+ ./src/gui/qgsdetaileditem*.cpp \
+ ./src/gui/qgsdetaileditem*.h
%build
@@ -95,41 +104,31 @@
-D GRASS_PREFIX=$GRASS_PREFIX \
-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
- -D CMAKE_SKIP_RPATH:BOOL=ON \
.
make VERBOSE=1 %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make VERBOSE=1 DESTDIR=%{buildroot} install
-# remove archives
-#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
+# remove rpath from files
+chrpath --delete \
+ %{buildroot}%{_bindir}/%{name} \
+ %{buildroot}%{python_sitearch}/%{name}/*.so
-# fix spurious executable bits
-%{__chmod} -x ./src/app/legend/qgslegend.h \
- ./src/app/legend/qgslegend.cpp
+# add executable perms to python libs so they get striped
+%{__chmod} +x %{buildroot}%{python_sitearch}/%{name}/*.so
# remove files packaged by doc
-%{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
- %{buildroot}/%{_datadir}/doc/SPONSORS
-
-# remove .cvsignore files
-#find . -name '.cvsignore' -exec %{__rm} -f {} ';'
-
-# fix non-executable file
-%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
-
-# remove headers
-%{__rm} -rf %{buildroot}/%{_includedir}/%{name}
+%{__rm} -f %{buildroot}%{_datadir}/doc/AUTHORS \
+ %{buildroot}%{_datadir}/doc/SPONSORS
# install desktop file
-%{__install} -d %{buildroot}/%{_datadir}/pixmaps
+%{__install} -d %{buildroot}%{_datadir}/pixmaps
%{__install} -m0644 \
- %{buildroot}/%{_datadir}/%{name}/images/icons/qgis-icon.png \
- %{buildroot}/%{_datadir}/pixmaps/%{name}.png
+ %{buildroot}%{_datadir}/%{name}/images/icons/qgis-icon.png \
+ %{buildroot}%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
@@ -146,14 +145,17 @@
%postun grass -p /sbin/ldconfig
+%post python -p /sbin/ldconfig
+
+%postun python -p /sbin/ldconfig
+
%files
%defattr(-, root, root, -)
%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
%{_bindir}/%{name}
%{_bindir}/%{name}_help
-%{_bindir}/msexport
-%{_libdir}/lib%{name}_*.so
+%{_libdir}/lib%{name}_*.so.*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libcopyrightlabelplugin.so
%{_libdir}/%{name}/libdelimitedtextplugin.so
@@ -162,10 +164,12 @@
%{_libdir}/%{name}/libgpsimporterplugin.so
%{_libdir}/%{name}/libgpxprovider.so
%{_libdir}/%{name}/libgridmakerplugin.so
+%{_libdir}/%{name}/libmemoryprovider.so
%{_libdir}/%{name}/libnortharrowplugin.so
%{_libdir}/%{name}/libogrprovider.so
%{_libdir}/%{name}/libpggeoprocessingplugin.so
%{_libdir}/%{name}/libpostgresprovider.so
+%{_libdir}/%{name}/libquickprintplugin.so
%{_libdir}/%{name}/libscalebarplugin.so
%{_libdir}/%{name}/libspitplugin.so
%{_libdir}/%{name}/libwfsplugin.so
@@ -177,29 +181,32 @@
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/i18n
%{_datadir}/%{name}/images
-%{_datadir}/%{name}/python
%{_datadir}/%{name}/resources
%{_datadir}/%{name}/svg
%dir %{_datadir}/%{name}/themes
%dir %{_datadir}/%{name}/themes/default
%{_datadir}/%{name}/themes/default/*.png
-%{python_sitearch}/%{name}
%{_mandir}/man1/*
-#%files devel
-#%defattr(-, root, root, -)
-#%{_includedir}/%{name}
+%files devel
+%defattr(-, root, root, -)
+%{_includedir}/%{name}
+%{_libdir}/lib%{name}_*.so
+%{_libdir}/libqgisgrass.so
+%{_libdir}/libqgispython.so
%files grass
%defattr(-, root, root, -)
-%{_libdir}/libqgisgrass.so
+%{_libdir}/libqgisgrass.so.*
%{_libdir}/%{name}/libgrass*.so
%{_datadir}/%{name}/grass
%{_datadir}/%{name}/themes/default/grass
-#%files python
-#%defattr(-, root, root, -)
-#%{_datadir}/%{name}/python
+%files python
+%defattr(-, root, root, -)
+%{_libdir}/libqgispython.so.*
+%{_datadir}/%{name}/python
+%{python_sitearch}/%{name}
%files theme-nkids
%defattr(-, root, root, -)
@@ -207,6 +214,39 @@
%changelog
+* Mon Aug 11 2008 Douglas E. Warner <silfreed at silfreed.net> 0.11.0-2
+- building against blas and lapack instead of atlas and blas to fix missing
+ library calls
+
+* Wed Jul 16 2008 Douglas E. Warner <silfreed at silfreed.net> 0.11.0-1
+- update to metis 0.11.0
+- remove python patch
+- enabling python subpackage
+- fixed executable perms on new headers/source
+- stripping rpath with chrpath
+- making python libs executable to get files stripped
+
+* Fri Mar 28 2008 Douglas E. Warner <silfreed at silfreed.net> 0.10.0-2
+- added patch to support cmake 2.6
+
+* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> - 0.10.0-1
+- upgraded to 0.10.0 release candidate
+- removed gcc 4.3 patches
+- adding devel package since libraries are now versioned
+
+* Fri Mar 28 2008 Balint Cristian <rezso at rdsor.ro> - 0.9.1-5
+- fix build by adding more gcc43 patches
+- rebuild against grass63
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.1-4
+- Autorebuild for GCC 4.3
+
+* Mon Feb 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-4
+- adding gcc43-INT_MAX-qgis-0.9.1.patch
+- adding gcc43-duplicate_function_param-qgis-0.9.1.patch
+- adding gcc43-memcpy-qgis-0.9.1.patch
+- adding gcc43-memcpy-strtod-qgis-0.9.1.patch
+
* Mon Feb 18 2008 Douglas E. Warner <silfreed at silfreed.net> 0.9.1-3
- adding Requires sip, PyQt4 for python bindings support
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 29 Jan 2008 18:59:43 -0000 1.4
+++ sources 12 Aug 2008 15:00:16 -0000 1.5
@@ -1 +1 @@
-cc1be019033451ec6c4b3838b26d69ae qgis-0.9.1.tar.gz
+33a2c5bab0e61fd443250ccd431b6e48 qgis_0.11.0.tar.gz
More information about the fedora-extras-commits
mailing list