From e0c56bd30609b26fb0c48f56c8b449c8c49b08b7254bff2e7ec11898debbeca2 Mon Sep 17 00:00:00 2001 From: Otto Dassau Date: Sun, 28 Dec 2008 12:41:24 +0000 Subject: [PATCH] update to 1.0.0 release OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=59 --- qgis-1.0.0.tar.bz2 | 3 ++ qgis.spec | 18 +++---- sqlite3.patch | 117 +++++++++++++++++++++------------------------ 3 files changed, 68 insertions(+), 70 deletions(-) create mode 100644 qgis-1.0.0.tar.bz2 diff --git a/qgis-1.0.0.tar.bz2 b/qgis-1.0.0.tar.bz2 new file mode 100644 index 0000000..ee6b511 --- /dev/null +++ b/qgis-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03252e1ee981cbed95c4cab0d7418f9e054cefaa4166813ffcc920cebed42c86 +size 19188234 diff --git a/qgis.spec b/qgis.spec index 84b77eb..7e8d8e0 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,5 +1,5 @@ Name: qgis -Version: 0.11.0 +Version: 1.0.0 Release: 1 License: GPL Group: Applications/GIS @@ -16,7 +16,7 @@ Requires: libgdal >= 1.5.0 Requires: sqlite >= 3.5 BuildRequires: sqlite-devel >= 3.5 %endif -Requires: libqt4 >= 4.2 +Requires: libqt4 >= 4.3 Requires: gsl >= 1.6 Requires: postgresql >= 8 postgresql-libs >= 8 Requires: python-qt4 python-xml @@ -27,7 +27,7 @@ BuildRequires: libproj-devel BuildRequires: postgresql-devel >= 8 BuildRequires: grass >= 6.2.3 grass-devel BuildRequires: libgdal-grass >= 1.4.1 -BuildRequires: libqt4-devel >= 4.2 libqt4-qt3support >= 4.2 +BuildRequires: libqt4-devel >= 4.3 libqt4-qt3support >= 4.3 BuildRequires: gsl >= 1.6 gsl-devel BuildRequires: cmake >= 2.4 BuildRequires: flex bison @@ -42,7 +42,7 @@ Requires: qgis = %{version} Summary: GRASS Support Libraries for Quantum GIS Group: Applications/GIS Requires: qgis = %{version} -Requires: grass >= 6.2.3 +Requires: grass >= 6.3 %description Quantum GIS (QGIS) is a user friendly Open Source Geographic Information @@ -62,7 +62,7 @@ GRASS plugin for Quantum GIS required to interface with GRASS system. %prep %setup -%patch -p0 +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -131,7 +131,7 @@ rm -rf %{buildroot} %defattr(644,root,root) %{_libdir}/qgis/libgrass* %{_libdir}/libqgisgrass.so -%{_libdir}/libqgisgrass.so.0.11 +%{_libdir}/libqgisgrass.so.1.0 %post plugin-grass -p /sbin/ldconfig @@ -142,11 +142,13 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %changelog -n qgis -* Fri Aug 29 2008 Otto Dassau 0.11.0 +* Sun Dec 28 2008 Otto Dassau 1.0.0 +- update for new version +* Fri Aug 29 2008 Otto Dassau 0.11.0 - update to build also on SLE_10 and 10.2 - use internal sqlite3 to support older suse versions - added python-xml -* Mon Jul 14 2008 Otto Dassau 0.11.0 +* Mon Jul 14 2008 Otto Dassau 0.11.0 - update for new version, shorter description part - added rpmlintrc file * Fri Apr 18 2008 Otto Dassau 0.10.0 diff --git a/sqlite3.patch b/sqlite3.patch index 68e7c7d..b6ba0cd 100644 --- a/sqlite3.patch +++ b/sqlite3.patch @@ -1,62 +1,56 @@ -Index: debian/rules -=================================================================== ---- debian/rules (revision 9215) -+++ debian/rules (working copy) -@@ -36,6 +36,7 @@ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_SKIP_RPATH=TRUE \ - -D BINDINGS_GLOBAL_INSTALL=TRUE \ -+ -D WITH_INTERNAL_SQLITE3=TRUE \ - ../.. +--- qgis-1.0.0/debian/rules 2008-12-28 16:54:12.000000000 +0100 ++++ qgis-1.0.0_new/debian/rules 2008-12-28 17:17:46.000000000 +0100 +@@ -18,7 +18,8 @@ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_SKIP_RPATH=TRUE \ + -D BINDINGS_GLOBAL_INSTALL=TRUE \ +- -D PEDANTIC=TRUE ++ -D PEDANTIC=TRUE \ ++ -D WITH_INTERNAL_SQLITE3=TRUE - build: patch build-stamp -Index: src/app/CMakeLists.txt -=================================================================== ---- src/app/CMakeLists.txt (revision 9215) -+++ src/app/CMakeLists.txt (working copy) -@@ -189,11 +189,16 @@ - ../plugins - ../python - ${PROJ_INCLUDE_DIR} -- ${SQLITE3_INCLUDE_DIR} - ${GEOS_INCLUDE_DIR} - ${GDAL_INCLUDE_DIR} - ) - -+IF(WITH_INTERNAL_SQLITE3) -+ INCLUDE_DIRECTORIES(../core/sqlite3) -+ELSE(WITH_INTERNAL_SQLITE3) -+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR}) -+ENDIF(WITH_INTERNAL_SQLITE3) -+ - IF (POSTGRES_FOUND) - INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR}) - ENDIF (POSTGRES_FOUND) -Index: src/gui/CMakeLists.txt -=================================================================== ---- src/gui/CMakeLists.txt (revision 9215) -+++ src/gui/CMakeLists.txt (working copy) -@@ -83,10 +83,15 @@ - ${QT_QTSVG_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${QT_QTMAIN_LIBRARY} -- ${SQLITE3_LIBRARIES} - qgis_core - ) - -+IF (WITH_INTERNAL_SQLITE3) -+ TARGET_LINK_LIBRARIES(qgis_gui -+ ${SQLITE3_LIBRARIES} -+ ) -+ENDIF(WITH_INTERNAL_SQLITE3) -+ - INSTALL(TARGETS qgis_gui - RUNTIME DESTINATION ${QGIS_BIN_DIR} - LIBRARY DESTINATION ${QGIS_LIB_DIR} -Index: src/helpviewer/CMakeLists.txt -=================================================================== ---- src/helpviewer/CMakeLists.txt (revision 9215) -+++ src/helpviewer/CMakeLists.txt (working copy) + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +--- qgis-1.0.0/src/app/CMakeLists.txt 2008-12-28 16:54:17.000000000 +0100 ++++ qgis-1.0.0_new/src/app/CMakeLists.txt 2008-12-28 17:19:38.000000000 +0100 +@@ -188,11 +188,16 @@ + ../plugins + ../python + ${PROJ_INCLUDE_DIR} +- ${SQLITE3_INCLUDE_DIR} + ${GEOS_INCLUDE_DIR} + ${GDAL_INCLUDE_DIR} + ) + ++IF(WITH_INTERNAL_SQLITE3) ++ INCLUDE_DIRECTORIES(../core/sqlite3) ++ELSE(WITH_INTERNAL_SQLITE3) ++ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR}) ++ENDIF(WITH_INTERNAL_SQLITE3) ++ + IF (POSTGRES_FOUND) + INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR}) + ENDIF (POSTGRES_FOUND) +--- qgis-1.0.0/src/gui/CMakeLists.txt 2008-12-28 16:54:44.000000000 +0100 ++++ qgis-1.0.0_new/src/gui/CMakeLists.txt 2008-12-28 17:20:38.000000000 +0100 +@@ -85,10 +85,15 @@ + ${QT_QTSVG_LIBRARY} + ${QT_QTNETWORK_LIBRARY} + ${QT_QTMAIN_LIBRARY} +- ${SQLITE3_LIBRARIES} + qgis_core + ) + ++IF (WITH_INTERNAL_SQLITE3) ++ TARGET_LINK_LIBRARIES(qgis_gui ++ ${SQLITE3_LIBRARIES} ++ ) ++ENDIF(WITH_INTERNAL_SQLITE3) ++ + INSTALL(TARGETS qgis_gui + RUNTIME DESTINATION ${QGIS_BIN_DIR} + LIBRARY DESTINATION ${QGIS_LIB_DIR} +--- qgis-1.0.0/src/helpviewer/CMakeLists.txt 2008-12-28 16:54:51.000000000 +0100 ++++ qgis-1.0.0_new/src/helpviewer/CMakeLists.txt 2008-12-28 17:23:23.000000000 +0100 @@ -6,10 +6,15 @@ main.cpp qgshelpserver.cpp @@ -67,15 +61,15 @@ Index: src/helpviewer/CMakeLists.txt +IF(WITH_INTERNAL_SQLITE3) + SET(HELP_SRCS -+ ${HELP_SRCS} -+ ${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3/sqlite3.c ++ ${HELP_SRCS} ++ ${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3/sqlite3.c + ) +ENDIF(WITH_INTERNAL_SQLITE3) + SET (HELP_UIS qgshelpviewerbase.ui) SET (HELP_MOC_HDRS -@@ -34,13 +39,21 @@ +@@ -34,13 +39,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../core ${CMAKE_CURRENT_BINARY_DIR} @@ -85,7 +79,6 @@ Index: src/helpviewer/CMakeLists.txt +IF(WITH_INTERNAL_SQLITE3) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3) +ENDIF(WITH_INTERNAL_SQLITE3) -+ + TARGET_LINK_LIBRARIES(qgis_help - ${SQLITE3_LIBRARY}