- update to 0.9.1

- removing lib64 and man instal path patches (included upstream) - enabling python integration - reorganizing spec file to match fedora standards
2007-12-17 14:41:06 +00:00 · 2007-12-17 14:41:06 +00:00 · f2ad7176d5
parent 6390ed4895
commit f2ad7176d5
5 changed files with 43 additions and 117 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-qgis-0.9.0.tar.gz
+qgis-0.9.1.tar.gz
--- a/lib64-suffix-0.9.0.patch
+++ b/lib64-suffix-0.9.0.patch
@ -1,89 +0,0 @@
-diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
-+++ qgis-0.9.0/CMakeLists.txt	2007-09-27 13:04:41.000000000 -0400
-@@ -158,12 +158,13 @@
-   # common for MAC and UNIX
-   SET (QGIS_BIN_DIR    ${CMAKE_INSTALL_PREFIX}/bin)
-   SET (QGIS_DATA_DIR   ${CMAKE_INSTALL_PREFIX}/share/qgis)
-  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
-+  SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
-   SET(QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
-   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
- 
- 
-   IF (UNIX AND NOT APPLE)
-+    ADD_DEFINITIONS(-DLIB_SUFFIX=\\"${LIB_SUFFIX}\\")
-     ADD_DEFINITIONS(-DPREFIX=\\"${CMAKE_INSTALL_PREFIX}\\")
-     ADD_DEFINITIONS(-DPLUGINPATH=\\"${QGIS_PLUGIN_DIR}\\")
-     ADD_DEFINITIONS(-DPKGDATAPATH=\\"${QGIS_DATA_DIR}\\")
-diff -ruN qgis-0.9.0-orig/src/app/CMakeLists.txt qgis-0.9.0/src/app/CMakeLists.txt
--- qgis-0.9.0-orig/src/app/CMakeLists.txt	2007-07-27 12:25:42.000000000 -0400
-+++ qgis-0.9.0/src/app/CMakeLists.txt	2007-09-27 12:31:03.000000000 -0400
-@@ -225,7 +225,7 @@
- )
- 
- SET_TARGET_PROPERTIES(qgis PROPERTIES
-  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
-+  INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-   INSTALL_RPATH_USE_LINK_PATH true
- )
- 
-diff -ruN qgis-0.9.0-orig/src/core/CMakeLists.txt qgis-0.9.0/src/core/CMakeLists.txt
--- qgis-0.9.0-orig/src/core/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
-+++ qgis-0.9.0/src/core/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
-@@ -167,7 +167,7 @@
- 
- INSTALL(TARGETS qgis_core
-   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
-+  LIBRARY DESTINATION lib${LIB_SUFFIX})
- 
- 
- # Added by Tim to install headers
-diff -ruN qgis-0.9.0-orig/src/core/qgsapplication.cpp qgis-0.9.0/src/core/qgsapplication.cpp
--- qgis-0.9.0-orig/src/core/qgsapplication.cpp	2007-07-25 16:00:26.000000000 -0400
-+++ qgis-0.9.0/src/core/qgsapplication.cpp	2007-09-27 10:35:06.000000000 -0400
-@@ -29,6 +29,10 @@
- #include <netinet/in.h>
- #endif
- 
-+#ifndef LIB_SUFFIX
-+#define LIB_SUFFIX ""
-+#endif
-+
- QString QgsApplication::mPrefixPath;
- QString QgsApplication::mPluginPath;
- QString QgsApplication::mPkgDataPath;
-@@ -69,7 +73,7 @@
- 	setPluginPath(mPrefixPath + QString("/plugins"));
- 	setPkgDataPath(mPrefixPath);
- #else
-    setPluginPath(mPrefixPath + QString("/lib/qgis"));
-+    setPluginPath(mPrefixPath + QString("/lib") + LIB_SUFFIX + QString("/qgis"));
-     setPkgDataPath(mPrefixPath + QString("/share/qgis"));
- #endif
-   }
-diff -ruN qgis-0.9.0-orig/src/gui/CMakeLists.txt qgis-0.9.0/src/gui/CMakeLists.txt
--- qgis-0.9.0-orig/src/gui/CMakeLists.txt	2007-08-29 15:17:03.000000000 -0400
-+++ qgis-0.9.0/src/gui/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
-@@ -79,7 +79,7 @@
- 
- INSTALL(TARGETS qgis_gui
-   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
-+  LIBRARY DESTINATION lib${LIB_SUFFIX})
- 
- # for installing headers
- 
-diff -ruN qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt qgis-0.9.0/src/providers/grass/CMakeLists.txt
--- qgis-0.9.0-orig/src/providers/grass/CMakeLists.txt	2007-07-25 23:20:16.000000000 -0400
-+++ qgis-0.9.0/src/providers/grass/CMakeLists.txt	2007-09-27 10:17:12.000000000 -0400
-@@ -49,7 +49,7 @@
- 
- INSTALL(TARGETS qgisgrass
-   RUNTIME DESTINATION ${QGIS_BIN_DIR}
-  LIBRARY DESTINATION lib)
-+  LIBRARY DESTINATION lib${LIB_SUFFIX})
-        
- INSTALL(TARGETS grassprovider
-   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
--- a/man-install-share-0.9.0.patch
+++ b/man-install-share-0.9.0.patch
@ -1,12 +0,0 @@
-diff -ruN qgis-0.9.0-orig/CMakeLists.txt qgis-0.9.0/CMakeLists.txt
--- qgis-0.9.0-orig/CMakeLists.txt	2007-08-27 19:29:28.000000000 -0400
-+++ qgis-0.9.0/CMakeLists.txt	2007-09-26 08:53:04.000000000 -0400
-@@ -241,7 +241,7 @@
- 
- # manual page... install also on windows?
- INSTALL (FILES qgis.man
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
-+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
- 
- 
- #############################################################
--- a/qgis.spec
+++ b/qgis.spec
@ -1,18 +1,17 @@
 %define qt4_bindir %{_libdir}/qt4/bin

-Summary: A user friendly Open Source Geographic Information System
 Name: qgis
-Version: 0.9.0
-Release: 2%{?dist}
-#Epoch: 1
-License: GPLv2+
+Version: 0.9.1
+Release: 1%{?dist}
+Summary: A user friendly Open Source Geographic Information System
+
 Group: Applications/Engineering
+License: GPLv2+
+URL: http://qgis.org/
 Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
-Patch0: man-install-share-0.9.0.patch
-Patch1: lib64-suffix-0.9.0.patch
-URL: http://qgis.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: qt4-devel
@ -26,6 +25,8 @@ BuildRequires: sqlite-devel
 BuildRequires: python-devel
 # grass package contains definitions needed for configure script
 BuildRequires: grass, grass-devel
+BuildRequires: python-devel
+BuildRequires: PyQt4-devel

 %description
 Quantum GIS (QGIS) is a user friendly Open Source Geographic Information 
@ -35,6 +36,7 @@ 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, 
 geotiff). QGIS supports plugins to do things like display tracks from your GPS.

+
 #%package devel
 #Summary: Headers and libraries for building against qgis
 #Group: Development/Libraries
@ -43,6 +45,7 @@ geotiff). QGIS supports plugins to do things like display tracks from your GPS.
 #%description devel
 #Headers and libraries for building against qgis

+
 %package grass
 Summary: GRASS plugins for qgis
 Group: Applications/Engineering
@ -52,6 +55,16 @@ Requires: grass
 %description grass
 GRASS plugins for qgis

+
+#%package python
+#Summary: python integration and plugins
+#Group: Applications/Engineering
+#Requires: %{name} = %{version}-%{release}
+#
+#%description python
+#python integration and plugins
+
+
 %package theme-nkids
 Summary: Addtional theme for qgis - nkids
 Group: Applications/Engineering
@ -60,16 +73,17 @@ Requires: %{name} = %{version}-%{release}
 %description theme-nkids
 Addtional theme for qgis - nkids

+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+

 %build
 for dir in %{_libdir}/grass-*/ ; do
 	GRASS_PREFIX=$dir
 done
 %cmake \
+	-D QGIS_MANUAL_SUBDIR=share/man \
 	-D GRASS_PREFIX=$GRASS_PREFIX \
 	-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
 	-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
@ -77,6 +91,7 @@ done
 	.
 make VERBOSE=1 %{?_smp_mflags}

+
 %install
 %{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@ -111,6 +126,7 @@ desktop-file-install --vendor="fedora" \
 	--dir=%{buildroot}%{_datadir}/applications \
 	%{SOURCE1}

+
 %clean
 %{__rm} -rf %{buildroot}

@ -122,6 +138,7 @@ desktop-file-install --vendor="fedora" \

 %postun grass -p /sbin/ldconfig

+
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
@ -164,10 +181,6 @@ desktop-file-install --vendor="fedora" \
 #%defattr(-, root, root, -)
 #%{_includedir}/%{name}

-%files theme-nkids
-%defattr(-, root, root, -)
-%{_datadir}/%{name}/themes/nkids
-
 %files grass
 %defattr(-, root, root, -)
 %{_libdir}/libqgisgrass.so
@ -175,7 +188,21 @@ desktop-file-install --vendor="fedora" \
 %{_datadir}/%{name}/grass
 %{_datadir}/%{name}/themes/default/grass

+#%files python
+#%defattr(-, root, root, -)
+#%{_datadir}/%{name}/python
+
+%files theme-nkids
+%defattr(-, root, root, -)
+%{_datadir}/%{name}/themes/nkids
+
+
 %changelog
+* Fri Oct 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.9.1-1
+- update to 0.9.1
+- removing lib64 and man instal path patches (included upstream)
+- enabling python integration
+
 * Fri Oct 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.9.0-2
 - enabling build for PPC64 (bug#247152)

--- a/2
+++ b/2
@ -1 +1 @@
-b3450bfbbe02818aae6b617fab0b86ee  qgis-0.9.0.tar.gz
+cc1be019033451ec6c4b3838b26d69ae  qgis-0.9.1.tar.gz