rpms/qgis/devel .cvsignore, 1.4, 1.5 qgis.spec, 1.20, 1.21 sources, 1.4, 1.5 gcc43-INT_MAX-qgis-0.9.1.patch, 1.3, NONE gcc43-duplicate_function_param-qgis-0.9.1.patch, 1.2, NONE gcc43-memcpy-qgis-0.9.1.patch, 1.2, NONE gcc43-memcpy-strtod-qgis-0.9.1.patch, 1.1, NONE gcc43-qgis-0.9.1.patch, 1.1, NONE
Douglas E. Warner (silfreed)
fedora-extras-commits at redhat.com
Sun Jun 1 21:31:37 UTC 2008
- Previous message: rpms/libyahoo2/F-9 .cvsignore, 1.3, 1.4 libyahoo2.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message: rpms/libyahoo2/EL-5 libyahoo2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: silfreed
Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27557
Modified Files:
.cvsignore qgis.spec sources
Removed Files:
gcc43-INT_MAX-qgis-0.9.1.patch
gcc43-duplicate_function_param-qgis-0.9.1.patch
gcc43-memcpy-qgis-0.9.1.patch
gcc43-memcpy-strtod-qgis-0.9.1.patch gcc43-qgis-0.9.1.patch
Log Message:
* 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 17 Dec 2007 14:41:06 -0000 1.4
+++ .cvsignore 1 Jun 2008 21:30:49 -0000 1.5
@@ -1 +1 @@
-qgis-0.9.1.tar.gz
+qgis_0.10.0.tar.gz
Index: qgis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/qgis.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qgis.spec 28 Mar 2008 17:10:46 -0000 1.20
+++ qgis.spec 1 Jun 2008 21:30:49 -0000 1.21
@@ -2,21 +2,16 @@
%{!?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: 5%{?dist}
+Version: 0.10.0
+Release: 1%{?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
-Patch1: gcc43-INT_MAX-qgis-0.9.1.patch
-Patch2: gcc43-duplicate_function_param-qgis-0.9.1.patch
-Patch3: gcc43-memcpy-qgis-0.9.1.patch
-Patch4: gcc43-memcpy-strtod-qgis-0.9.1.patch
-Patch5: gcc43-qgis-0.9.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: sip
@@ -31,7 +26,6 @@
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
@@ -46,13 +40,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
@@ -86,11 +80,11 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p0
+
+# fix spurious executable bits
+%{__chmod} -x \
+ ./src/app/legend/qgslegend.h \
+ ./src/app/legend/qgslegend.cpp
%build
@@ -105,7 +99,6 @@
-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}
@@ -114,27 +107,10 @@
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
-# remove archives
-#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
-#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
-
-# fix spurious executable bits
-%{__chmod} -x ./src/app/legend/qgslegend.h \
- ./src/app/legend/qgslegend.cpp
-
# 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}
-
# install desktop file
%{__install} -d %{buildroot}/%{_datadir}/pixmaps
%{__install} -m0644 \
@@ -162,8 +138,7 @@
%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
@@ -176,6 +151,7 @@
%{_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
@@ -196,13 +172,15 @@
%{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
%files grass
%defattr(-, root, root, -)
-%{_libdir}/libqgisgrass.so
+%{_libdir}/libqgisgrass.so.*
%{_libdir}/%{name}/libgrass*.so
%{_datadir}/%{name}/grass
%{_datadir}/%{name}/themes/default/grass
@@ -217,6 +195,11 @@
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Dec 2007 14:41:06 -0000 1.4
+++ sources 1 Jun 2008 21:30:49 -0000 1.5
@@ -1 +1 @@
-cc1be019033451ec6c4b3838b26d69ae qgis-0.9.1.tar.gz
+01fba16f6e6e4f2cd832b520dfd05dd8 qgis_0.10.0.tar.gz
--- gcc43-INT_MAX-qgis-0.9.1.patch DELETED ---
--- gcc43-duplicate_function_param-qgis-0.9.1.patch DELETED ---
--- gcc43-memcpy-qgis-0.9.1.patch DELETED ---
--- gcc43-memcpy-strtod-qgis-0.9.1.patch DELETED ---
--- gcc43-qgis-0.9.1.patch DELETED ---
- Previous message: rpms/libyahoo2/F-9 .cvsignore, 1.3, 1.4 libyahoo2.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message: rpms/libyahoo2/EL-5 libyahoo2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list