[qgis] Title bar string and desktop file corrected
Volker Fröhlich
volter at fedoraproject.org
Sun Feb 27 00:11:49 UTC 2011
commit b7dbbd397fe0bbc21fcde577fb90d7b08108db67
Author: Volker Fröhlich <volker27 at gmx.at>
Date: Sun Feb 27 01:11:47 2011 +0100
Title bar string and desktop file corrected
qgis.desktop | 3 +--
qgis.spec | 26 +++++++++++++++++++++-----
2 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/qgis.desktop b/qgis.desktop
index 4e31ae0..fb8ff27 100644
--- a/qgis.desktop
+++ b/qgis.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Quantum GIS
GenericName=Geographic Information System
Comment=
@@ -7,4 +6,4 @@ Exec=qgis
Icon=qgis
Terminal=false
Type=Application
-Categories=Geography;Viewer;Graphics;
+Categories=Education;Geography;Science;
diff --git a/qgis.spec b/qgis.spec
index 3011daf..4dd511b 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -4,7 +4,7 @@
Name: qgis
Version: 1.6.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@@ -13,6 +13,8 @@ URL: http://www.qgis.org/
Source0: http://qgis.org/~timlinux/src/%{name}_%{version}.tar.gz
Source1: %{name}.desktop
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
# 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
@@ -29,10 +31,15 @@ BuildRequires: gsl-devel
BuildRequires: postgresql-devel
BuildRequires: proj-devel
BuildRequires: sqlite-devel
+BuildRequires: libspatialite-devel
BuildRequires: chrpath
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
BuildRequires: qwt-devel
+
+#Note for future EPEL version:
+#grass is not in EPEL, qt4-webkit does not exist
+
BuildRequires: PyQwt-devel
BuildRequires: sip-devel > 4.7
BuildRequires: python-devel
@@ -40,7 +47,7 @@ BuildRequires: PyQt4-devel
BuildRequires: qt4-webkit-devel
BuildRequires: fcgi-devel
-# grass package contains definitions needed for configure script
+# Grass package contains definitions needed for configure script
BuildRequires: grass, grass-devel
Requires: gpsbabel
@@ -98,14 +105,19 @@ Python integration and plugins for QGIS.
%patch0 -p1 -b .grass
%patch1 -p1 -b .sip
-# Encode man-file to utf-8
+# Encode man-file to utf-8 -- Solved in 1.7.
iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1
-# Remove obsolete translations
+# Correct version string in title bar
+sed -i 's|Trunk|Copiapo|' CMakeLists.txt
+
+# Remove obsolete translations -- They will be there again in 1.7!
#/usr/bin/lupdate-qt4 -noobsolete -ts i18n/qgis_*.ts
%build
+#GDAL script doesn't work properly
+
# Detection doesn't work on it's own
GRASS_PREFIX=%{_libdir}
@@ -219,10 +231,14 @@ rm -rf %{buildroot}
%{python_sitearch}/%{name}
%changelog
+* Sat Feb 25 2011 Volker Fröhlich <volker27 at gmx.at> - 1.6.0-7
+- Added buildroot
+- Corrected window title
+- Removed encoding key from desktop file and corrected categories
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
* Wed Feb 02 2011 Volker Fröhlich <volker27 at gmx.at> - 1.6.0-5
- Remove libspatialite BR
- Forgot to turn off smp-flags
More information about the scm-commits
mailing list