Title bar string and desktop file corrected
This commit is contained in:
parent
a924a82e9e
commit
b7dbbd397f
|
@ -1,5 +1,4 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Encoding=UTF-8
|
|
||||||
Name=Quantum GIS
|
Name=Quantum GIS
|
||||||
GenericName=Geographic Information System
|
GenericName=Geographic Information System
|
||||||
Comment=
|
Comment=
|
||||||
|
@ -7,4 +6,4 @@ Exec=qgis
|
||||||
Icon=qgis
|
Icon=qgis
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Geography;Viewer;Graphics;
|
Categories=Education;Geography;Science;
|
||||||
|
|
26
qgis.spec
26
qgis.spec
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
Name: qgis
|
Name: qgis
|
||||||
Version: 1.6.0
|
Version: 1.6.0
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: A user friendly Open Source Geographic Information System
|
Summary: A user friendly Open Source Geographic Information System
|
||||||
|
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
|
@ -13,6 +13,8 @@ URL: http://www.qgis.org/
|
||||||
Source0: http://qgis.org/~timlinux/src/%{name}_%{version}.tar.gz
|
Source0: http://qgis.org/~timlinux/src/%{name}_%{version}.tar.gz
|
||||||
Source1: %{name}.desktop
|
Source1: %{name}.desktop
|
||||||
|
|
||||||
|
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||||
|
|
||||||
# Fix detection problem for GRASS libraries
|
# Fix detection problem for GRASS libraries
|
||||||
# Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863
|
# Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863
|
||||||
Patch0: qgis-1.5.0-grass.patch
|
Patch0: qgis-1.5.0-grass.patch
|
||||||
|
@ -29,10 +31,15 @@ BuildRequires: gsl-devel
|
||||||
BuildRequires: postgresql-devel
|
BuildRequires: postgresql-devel
|
||||||
BuildRequires: proj-devel
|
BuildRequires: proj-devel
|
||||||
BuildRequires: sqlite-devel
|
BuildRequires: sqlite-devel
|
||||||
|
BuildRequires: libspatialite-devel
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: qt4-devel
|
BuildRequires: qt4-devel
|
||||||
BuildRequires: qwt-devel
|
BuildRequires: qwt-devel
|
||||||
|
|
||||||
|
#Note for future EPEL version:
|
||||||
|
#grass is not in EPEL, qt4-webkit does not exist
|
||||||
|
|
||||||
BuildRequires: PyQwt-devel
|
BuildRequires: PyQwt-devel
|
||||||
BuildRequires: sip-devel > 4.7
|
BuildRequires: sip-devel > 4.7
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
|
@ -40,7 +47,7 @@ BuildRequires: PyQt4-devel
|
||||||
BuildRequires: qt4-webkit-devel
|
BuildRequires: qt4-webkit-devel
|
||||||
BuildRequires: fcgi-devel
|
BuildRequires: fcgi-devel
|
||||||
|
|
||||||
# grass package contains definitions needed for configure script
|
# Grass package contains definitions needed for configure script
|
||||||
BuildRequires: grass, grass-devel
|
BuildRequires: grass, grass-devel
|
||||||
|
|
||||||
Requires: gpsbabel
|
Requires: gpsbabel
|
||||||
|
@ -98,14 +105,19 @@ Python integration and plugins for QGIS.
|
||||||
%patch0 -p1 -b .grass
|
%patch0 -p1 -b .grass
|
||||||
%patch1 -p1 -b .sip
|
%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
|
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
|
#/usr/bin/lupdate-qt4 -noobsolete -ts i18n/qgis_*.ts
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
#GDAL script doesn't work properly
|
||||||
|
|
||||||
# Detection doesn't work on it's own
|
# Detection doesn't work on it's own
|
||||||
GRASS_PREFIX=%{_libdir}
|
GRASS_PREFIX=%{_libdir}
|
||||||
|
|
||||||
|
@ -219,10 +231,14 @@ rm -rf %{buildroot}
|
||||||
%{python_sitearch}/%{name}
|
%{python_sitearch}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 25 2011 Volker Fröhlich <volker27@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@lists.fedoraproject.org> - 1.6.0-6
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
|
||||||
* Wed Feb 02 2011 Volker Fröhlich <volker27@gmx.at> - 1.6.0-5
|
* Wed Feb 02 2011 Volker Fröhlich <volker27@gmx.at> - 1.6.0-5
|
||||||
- Remove libspatialite BR
|
- Remove libspatialite BR
|
||||||
- Forgot to turn off smp-flags
|
- Forgot to turn off smp-flags
|
||||||
|
|
Reference in New Issue
Block a user