rpms/qgis/FC-6 man-install-share.patch, NONE, 1.1 qgis.desktop, NONE, 1.1 qgis.spec, NONE, 1.1 settings-include-workdir.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Douglas E. Warner (silfreed)
fedora-extras-commits at redhat.com
Tue Jul 3 15:35:55 UTC 2007
Author: silfreed
Update of /cvs/pkgs/rpms/qgis/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25839/FC-6
Modified Files:
.cvsignore sources
Added Files:
man-install-share.patch qgis.desktop qgis.spec
settings-include-workdir.patch
Log Message:
import qgis into FC-6 (bug#241403)
man-install-share.patch:
--- NEW FILE man-install-share.patch ---
diff -ruN qgis-0.8.1-orig/CMakeLists.txt qgis-0.8.1/CMakeLists.txt
--- qgis-0.8.1-orig/CMakeLists.txt 2007-02-23 12:20:33.000000000 -0500
+++ qgis-0.8.1/CMakeLists.txt 2007-06-22 10:53:58.000000000 -0400
@@ -220,7 +220,7 @@
# manual page... install also on windows?
INSTALL (FILES qgis.man
- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
#############################################################
# Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ
--- NEW FILE qgis.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Quantum GIS
GenericName=Geographic Information System
Comment=
Exec=qgis
Icon=qgis.png
Terminal=false
Type=Application
Categories=Graphics;
--- NEW FILE qgis.spec ---
%define qt4_bindir %{_libdir}/qt4/bin
Summary: A user friendly Open Source Geographic Information System
Name: qgis
Version: 0.8.1
Release: 6%{?dist}
#Epoch: 1
License: GPL
Group: Applications/Engineering
Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Patch0: settings-include-workdir.patch
Patch1: man-install-share.patch
URL: http://qgis.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
BuildRequires: bison, flex
BuildRequires: expat-devel
BuildRequires: gdal-devel
BuildRequires: geos-devel
BuildRequires: gsl-devel
BuildRequires: postgresql-devel
BuildRequires: sqlite-devel
# grass package contains definitions needed for configure script
BuildRequires: grass, grass-devel
%description
Quantum GIS (QGIS) is a user friendly Open Source Geographic Information
System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS supports
vector, raster, and database formats. QGIS is licensed under the GNU
General Public License. QGIS lets you browse and create map data on your
computer. It supports many common spatial data formats (e.g. ESRI ShapeFile,
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 grass
Summary: GRASS plugins for qgis
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
%description grass
GRASS plugins for qgis
%package theme-nkids
Summary: Addtional theme for qgis - nkids
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
%description theme-nkids
Addtional theme for qgis - nkids
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
for dir in %{_libdir}/grass-*/ ; do
GRASS_PREFIX=$dir
done
%cmake \
-D GRASS_PREFIX=$GRASS_PREFIX \
-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
-D CMAKE_SKIP_RPATH:BOOL=YES \
.
make VERBOSE=1 %{?_smp_mflags}
%install
%{__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/legend/qgslegend.h
%{__chmod} -x ./src/legend/qgslegend.cpp
# remove doc because it gets packaged by %doc
%{__rm} -rf %{buildroot}/%{_datadir}/%{name}/doc
# 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 \
%{buildroot}/%{_datadir}/%{name}/images/icons/qgis-icon.png \
%{buildroot}/%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor="fedora" \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
%clean
%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post grass -p /sbin/ldconfig
%postun grass -p /sbin/ldconfig
%files
%defattr(-, root, root, -)
%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS TODO CONTRIBUTORS doc/*
%{_bindir}/%{name}
%{_bindir}/%{name}_help
#%{_bindir}/msexport
%{_libdir}/lib%{name}_*.so
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libcopyrightlabelplugin.so
%{_libdir}/%{name}/libdelimitedtextplugin.so
%{_libdir}/%{name}/libdelimitedtextprovider.so
%{_libdir}/%{name}/libgeorefplugin.so
%{_libdir}/%{name}/libgpsimporterplugin.so
%{_libdir}/%{name}/libgpxprovider.so
%{_libdir}/%{name}/libgridmakerplugin.so
%{_libdir}/%{name}/liblauncherplugin.so
%{_libdir}/%{name}/libnortharrowplugin.so
%{_libdir}/%{name}/libogrprovider.so
%{_libdir}/%{name}/libpggeoprocessingplugin.so
%{_libdir}/%{name}/libpostgresprovider.so
%{_libdir}/%{name}/libscalebarplugin.so
%{_libdir}/%{name}/libspitplugin.so
%{_libdir}/%{name}/libwfsplugin.so
%{_libdir}/%{name}/libwfsprovider.so
%{_libdir}/%{name}/libwmsprovider.so
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%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
%{_mandir}/man1/*
#%files devel
#%defattr(-, root, root, -)
#%{_includedir}/%{name}
%files theme-nkids
%defattr(-, root, root, -)
%{_datadir}/%{name}/themes/nkids
%files grass
%defattr(-, root, root, -)
%{_libdir}/libqgisgrass.so
%{_libdir}/%{name}/libgrass*.so
%{_datadir}/%{name}/grass
%{_datadir}/%{name}/themes/default/grass
%changelog
* Thu Jun 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-6
- fixed date of changelog entry for 0.8.1-5 from Wed Jun 27 2007 to
Thu Jun 28 2007
- linking icon to included png instead of packaging it again
* Thu Jun 28 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-5
- adding comment on why grass is required in addition to grass-devel for BR
- fixing typo
* Wed Jun 27 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-4
- adding contributors to doc
- adding desktop file and icon
* Mon Jun 25 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-3
- updating detection of grass libraries to not use RPM call
- disabling building of -devel package due to shared libraries not being
versioned and having no other packages that compile against qgis
(see bug #241403)
- removing chmod of test_export.py due to lack of python requirement
- removing msexport and share/python directory due to removal of python
* Fri Jun 22 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-2
- added BuildRequires: cmake
- updated build to use cmake macro and make verbose
* Mon Jun 19 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.1-1
- updating version
- removed BuildRequires: python-devel due to lack of PyQt4 bindings
- updated build for use of cmake instead of autotools
- added patch for setting WORKDIR in settings.pro file
- added patch for fixing install path of man pages
- updated library names
* Tue May 29 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.0-6
- adding BuildRequires bison, flex
* Tue May 29 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.0-5
- fixing more directory owernship (themes, themes-default)
- fixing qt4 hardcoded lib path
- removing Requires ldconfig
- adding BuildRequires sqlite-devel
- adding patch for supporting python 2.5 in configure script
* Sat May 26 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.0-4
- moving all BuildRequires to main section
- dropping use of makeinstall macro
- making sure directories are owned by this package
- removing *.a and *.la files
- disabled stripping of libraries and binaries to allow debuginfo package
to be built
- fixing macros in changelog
- removing executable bits on source files
* Wed May 16 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.0-3
- fixing Requires statements for sub-packages
* Tue May 15 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.0-2
- added devel dependancy on qgis
- moved qgis-config to devel package
- moving doc directory
- removed zero-length NEWS doc
- added postin/postun ldconfig calls
- split packages up to reduce package size and split out dependancies
grass, theme-nkids
* Mon May 14 2007 Douglas E. Warner <silfreed at silfreed.net> 0.8.0-1
- Initial RPM release.
settings-include-workdir.patch:
--- NEW FILE settings-include-workdir.patch ---
diff -ru qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
--- qgis-0.8.1-orig/settings.pro 2007-01-01 23:31:27.000000000 -0500
+++ qgis-0.8.1/settings.pro 2007-06-18 09:21:44.000000000 -0400
@@ -211,6 +211,7 @@
$${WORKDIR}/src/providers/wfs \
$${WORKDIR}/src/ui
INCLUDEPATH += $${OBJDIR}/ui
+INCLUDEPATH += $${WORKDIR}
#################################################################
#
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 3 Jul 2007 14:59:21 -0000 1.1
+++ .cvsignore 3 Jul 2007 15:35:19 -0000 1.2
@@ -0,0 +1 @@
+qgis-0.8.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 3 Jul 2007 14:59:21 -0000 1.1
+++ sources 3 Jul 2007 15:35:19 -0000 1.2
@@ -0,0 +1 @@
+59dca6f6e549a5d28086562f4046820a qgis-0.8.1.tar.gz
More information about the scm-commits
mailing list