- Remove wrong libproj-devel-static dependency

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

qgis.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 18 14:52:41 UTC 2011 - idonmez@novell.com
+
+- Remove wrong libproj-devel-static dependency 
+
 -------------------------------------------------------------------
 Thu Aug 18 11:21:03 UTC 2011 - otto.dassau@gmx.de
 

qgis.spec

@@ -1,31 +1,36 @@
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
 Name:           qgis
 Version:        1.7.0
 Release:        1
 License:        GPL
+Summary:        Quantum GIS (QGIS) is a Geographic Information System (GIS)
+Url:            http://www.qgis.org/
 Group:          Applications/GIS
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
-Source2:	%{name}.rpmlintrc
+Source2:        %{name}.rpmlintrc
-Url:            http://www.qgis.org/
-Summary:        Quantum GIS (QGIS) is a Geographic Information System (GIS)
-Packager:       Otto Dassau <dassau@gbd-consult.de>
-Requires:       libgeos >= 2
 Requires:       libgdal1 >= 1.6.0
+Requires:       libgeos >= 2
+Packager:       Otto Dassau <dassau@gbd-consult.de>
 %if 0%{?suse_version} > 1030
-Requires:	sqlite >= 3.5
 BuildRequires:  sqlite-devel >= 3.5
+Requires:       sqlite >= 3.5
 %endif
-Requires:       libqt4 >= 4.3
-Requires:       gsl >= 1.6
-Requires:       postgresql >= 8 postgresql-libs >= 8
-Requires:	python-qt4
-Requires:	python-sip 
-Requires:	python-xml
-Requires:	gpsbabel
-Requires:	python-gdal
-BuildRequires:	qwt-devel >= 5
 BuildRequires:  libexpat-devel
 BuildRequires:  python-devel
+BuildRequires:  qwt-devel >= 5
+Requires:       gpsbabel
+Requires:       gsl >= 1.6
+Requires:       libqt4 >= 4.3
+Requires:       postgresql >= 8
+Requires:       postgresql-libs >= 8
+Requires:       python-gdal
+Requires:       python-qt4
+Requires:       python-sip
+Requires:       python-xml
 %if 0%{?suse_version} <= 1030 || 0%{?suse_version} >= 1120
 BuildRequires:  python-qt4-devel
 BuildRequires:  python-sip-devel
@@ -33,43 +38,44 @@ BuildRequires:  python-sip-devel
 BuildRequires:  python-qt4
 BuildRequires:  python-sip
 %endif
+BuildRequires:  -post-build-checks
+BuildRequires:  FastCGI-devel
+BuildRequires:  bison
+BuildRequires:  cmake >= 2.4
+BuildRequires:  flex
+BuildRequires:  grass
+BuildRequires:  grass-devel
+BuildRequires:  gsl >= 1.6
+BuildRequires:  gsl-devel
+BuildRequires:  libQtWebKit-devel >= 4.3
 BuildRequires:  libgdal-devel >= 1.6.0
 BuildRequires:  libgeos-devel >= 2
 BuildRequires:  libproj-devel
-BuildRequires:  libproj-devel-static
+BuildRequires:  libqt4-devel >= 4.3
-BuildRequires:  postgresql-devel >= 8
-BuildRequires:  grass
-BuildRequires:  grass-devel
-BuildRequires:  libqt4-devel >= 4.3 
 BuildRequires:  libqt4-qt3support >= 4.3
-BuildRequires:  libQtWebKit-devel >= 4.3
+BuildRequires:  postgresql-devel >= 8
-BuildRequires:  gsl >= 1.6 gsl-devel
+BuildRequires:  txt2tags
-BuildRequires:  cmake >= 2.4
-BuildRequires:  flex bison
-BuildRequires:	txt2tags
-Buildrequires:	FastCGI-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  -post-build-checks
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Obsoletes:      qgis10
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package devel
-Summary:        Development Libraries for the Quantum GIS development branch 1.x
+Summary:        Development Libraries for the Quantum GIS development branch 1
 Group:          Development/Libraries
 Requires:       qgis = %{version}
 
 %package plugin-grass
-Summary:        GRASS Support Libraries for Quantum GIS development branch 1.x
+Summary:        GRASS Support Libraries for Quantum GIS development branch 1
 Group:          Applications/GIS
-Requires:       qgis = %{version}
 Requires:       grass
+Requires:       qgis = %{version}
 
 %description
-Quantum GIS (QGIS) is a user friendly Open Source Geographic Information 
+Quantum GIS (QGIS) is a user friendly Open Source Geographic Information
-System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS supports 
+System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS supports
-vector, raster, and database formats. QGIS is licensed under the GNU 
+vector, raster, and database formats. QGIS is licensed under the GNU
-General Public License. QGIS lets you browse and create map data on your 
+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, 
+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.
 
 %description devel
@@ -79,10 +85,10 @@ Development packages for Quantum GIS development branch 1.x including the C head
 GRASS plugin for Quantum GIS development branch 1.x required to interface with GRASS system.
 
 %prep
-%setup
+%setup -q
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
 export QTDIR=/usr
 export PATH=$PATH:$QTDIR/bin
 
@@ -116,12 +122,12 @@ export QTDIR=%{_prefix}
 #echo "export PATH=$PATH:$QTDIR/bin"
 export PATH=$PATH:$QTDIR/bin
 
-make
+make %{_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 mkdir -p %{buildroot}%{_datadir}/applications
-%{__cp} %{SOURCE1} %{buildroot}%{_datadir}/applications
+cp %{SOURCE1} %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 ln -s ../%{name}/images/icons/qgis-icon.png \
       %{buildroot}/%{_datadir}/pixmaps/%{name}.png
@@ -138,8 +144,7 @@ rm -rf %{buildroot}
 %{_libdir}/lib%{name}python.s*
 %{_libdir}/lib%{name}_*s*
 %{_libdir}/lib%{name}*s*
-%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/
-%{_libdir}/%{name}/*
 %{_mandir}/man1/*
 %{_datadir}/%{name}/*
 %{_datadir}/applications/%{name}.desktop
@@ -152,7 +157,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-%{_prefix}/include/qgis/*
+%{_includedir}/qgis/*
 %exclude %{_prefix}/lib/debug/*
 %exclude %{_prefix}/lib/debug/.build-id/*
 
@@ -174,4 +179,3 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-