- back to using grass package

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=170

qgis.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Aug 01 14:07:00 UTC 2015 - tzotsos@opensuse.org
+
+- back to using grass package
+
 -------------------------------------------------------------------
 Wed Jun 24 09:42:29 UTC 2015 - dassau@gbd-consult.de
 

qgis.spec

@@ -36,8 +36,8 @@ BuildRequires:  bison
 BuildRequires:  cmake >= 2.4
 BuildRequires:  flex
 BuildRequires:  gdal
-BuildRequires:  grass7
-BuildRequires:  grass7-devel
+BuildRequires:  grass
+BuildRequires:  grass-devel
 BuildRequires:  gsl >= 1.6
 BuildRequires:  gsl-devel
 BuildRequires:  libexpat-devel
@@ -72,7 +72,7 @@ Requires:       python-qt4-devel
 Requires:       python-sip
 Requires:       python-xml
 Requires:       python-wxWidgets
-Requires:       grass7-docs
+Requires:       grass-docs
 Recommends:     apache2-mod_fcgid
 Recommends:     gpsbabel
 Suggests:       %{name}-sample-data
@@ -84,11 +84,11 @@ Summary:        Development Libraries for the QGIS 2.8
 Group:          Development/Libraries/C and C++
 Requires:       qgis = %{version}
 
-%package plugin-grass7
+%package plugin-grass
 Summary:        GRASS Support Libraries for QGIS 2.8
 Group:          Productivity/Graphics/Visualization/Other
-Requires:       grass7
-Obsoletes:      qgis-plugin-grass
+Requires:       grass
+Obsoletes:      qgis-plugin-grass7
 Requires:       qgis = %{version}
 
 %package sample-data
@@ -109,7 +109,7 @@ geotiff). QGIS supports plugins to do things like display tracks from your GPS.
 %description devel
 Development packages for QGIS 2.8 including the C header files.
 
-%description plugin-grass7
+%description plugin-grass
 GRASS 7 plugin for QGIS 2.8 required to interface with GRASS system.
 
 %description sample-data
@@ -205,7 +205,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_prefix}/include/qgis/*
 
-%files plugin-grass7
+%files plugin-grass
 %defattr(644,root,root)
 %{_libdir}/qgis/libgrass*
 #%{_libdir}/libqgisgrass.so
@@ -218,9 +218,9 @@ rm -rf %{buildroot}
 %defattr(644,root,root)
 %{_datadir}/qgis/%{sampledir}
 
-%post plugin-grass7 -p /sbin/ldconfig
+%post plugin-grass -p /sbin/ldconfig
 
-%postun plugin-grass7 -p /sbin/ldconfig
+%postun plugin-grass -p /sbin/ldconfig
 
 %post -p /sbin/ldconfig