[qgis/f14: 16/16] Merge branch 'master' into f14

[Volker Fröhlich]

commit c5b16e7521ea1795690a3a0d7b63174ff4f37117
Merge: 2ba33a2 ea3d6f9
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Jul 6 23:42:20 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	qgis.spec
    	sources

 .gitignore                    |    2 +
 qgis-1.7.0-georef-crash.patch |   33 ++++
 qgis-1.7.0-histogram.patch    |   36 +++++
 qgis-mapserver-README.fedora  |   61 ++++++++
 qgis-mapserver-httpd.conf     |   16 ++
 qgis-mime.xml                 |   28 ++++
 qgis.desktop                  |    3 +-
 qgis.spec                     |  338 ++++++++++++++++++++++++++++++-----------
 sources                       |    2 +-
 9 files changed, 428 insertions(+), 91 deletions(-)
---
diff --cc qgis.spec
index 6862977,1071ec4..c48010f
--- a/qgis.spec
+++ b/qgis.spec
@@@ -225,14 -348,46 +348,53 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/%{name}/python
  %{python_sitearch}/%{name}
  
+ %files mapserver
+ %doc src/mapserver/admin.sld src/mapserver/wms_metadata.xml %{name}-mapserver-README.fedora
+ %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-mapserver.conf
+ %{_libexecdir}/%{name}
+ 
  %changelog
+ * Mon Jul 06 2011 Volker Fröhlich <volker27 at gmx.at> - 1.7.0-4
+ - Remove icon path macros, that don't work in EPEL
+ - Avoid creating unnecessary directories there
+ - Be explicit about the shared lib names in the files section
+ - Put libqgispython.so.1.7.0 in Python sub-package
+ - Correct FSF address
+ 
+ * Mon Jul 06 2011 Volker Fröhlich <volker27 at gmx.at> - 1.7.0-3
+ - Withdraw immature Lighty configuration
+ - Update README and provide a better sample configuration,
+   that utilizes mod_rewrite
+ 
+ * Mon Jun 26 2011 Volker Fröhlich <volker27 at gmx.at> - 1.7.0-2
+ - Add histogram patch
+ - Add scriplets to refresh icon cache
+ - Mention Fedora specific readme file in QGIS mapserver description
+ - Update the aforementioned file and the Apache configuration
+   with rewrite rules
+ 
+ * Mon Jun 26 2011 Volker Fröhlich <volker27 at gmx.at> - 1.7.0-1
+ - Update for 1.7
+ - License is now GPLv3+ (Sqlanyconnect)
+ - Add mapserver sub-package and require mod_fcgi
+ - Use upstreams current description text
+ - Drop now needless iconv 
+ - Rename new Serbian translations
+ - Install MIME type definitions and icons
+ - Add Readme file and sample configuration for Mapserver
+ - Add patch to avoid segfault when geo-referencing
+ - Add conditional for Spatialite and PPC64
+ - Add conditional for GRASS and EPEL
+ - Delete bundled libspatialite before building
+ - Removed glob from /usr/bin/qgis in files section
+ 
 +* Thu Mar 17 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-3.1
 +- rebuild (sip)
 +- backport sip patch from f15 branch
 +
 +* Thu Jan 27 2011 Bruno Wolff III >bruno at wolff.to> - 1.6.0-3
 +- Rebuild for qt soname bump
 +
  * Thu Nov 11 2010 Volker Fröhlich <volker27 at gmx.at> - 1.6.0-2
  - Disabled smp-flags again