Update to 2.1.0

.gitignore

@@ -1 +1,2 @@
 mmapper-2.0.4-final2-source.tar.gz
+/mmapper-2.1.0-source.tar.gz

mmapper-2.0.4-no-add-needed.patch

@@ -1,34 +0,0 @@
-diff -up mmapper-2.0.4-final2-source/CMakeLists.txt.no-add-needed mmapper-2.0.4-final2-source/CMakeLists.txt
---- mmapper-2.0.4-final2-source/CMakeLists.txt.no-add-needed	2009-05-26 18:41:10.000000000 +0300
-+++ mmapper-2.0.4-final2-source/CMakeLists.txt	2010-02-26 00:17:02.000000000 +0200
-@@ -7,6 +7,9 @@ set(QT_USE_QTXML TRUE)
- set(QT_USE_QTOPENGL TRUE)
- include(${QT_USE_FILE})
- 
-+find_package(OpenGL REQUIRED)
-+find_package(ZLIB REQUIRED)
-+
- # Get SVN revision number
- find_package(Subversion)
- if (Subversion_FOUND)
-diff -up mmapper-2.0.4-final2-source/src/CMakeLists.txt.no-add-needed mmapper-2.0.4-final2-source/src/CMakeLists.txt
---- mmapper-2.0.4-final2-source/src/CMakeLists.txt.no-add-needed	2009-05-26 18:41:10.000000000 +0300
-+++ mmapper-2.0.4-final2-source/src/CMakeLists.txt	2010-02-26 00:18:38.000000000 +0200
-@@ -148,6 +148,8 @@ include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}/preferences
-     ${CMAKE_CURRENT_SOURCE_DIR}/proxy
-     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty
-+    ${OPENGL_INCLUDE_DIR}
-+    ${ZLIB_INCLUDE_DIR}
- )
- 
- QT4_WRAP_CPP(mmapper_MOC_SRCS ${mmapper_MOC_HDRS})
-@@ -165,6 +167,8 @@ add_executable(mmapper WIN32
- target_link_libraries(mmapper
-     ${QT_QTMAIN_LIBRARY}
-     ${QT_LIBRARIES}
-+    ${OPENGL_gl_LIBRARY}
-+    ${ZLIB_LIBRARIES}
- )
- 
- # Begin CPack Settings

mmapper-fix-renderer-crash.patch

@@ -1,49 +0,0 @@
-Index: src/display/mapcanvas.cpp
-===================================================================
---- src/display/mapcanvas.cpp	(revision 179)
-+++ src/display/mapcanvas.cpp	(revision 180)
-@@ -844,6 +844,8 @@
-   {
-     m_scrollX = x;
-     m_scrollY = y;
-+
-+    makeCurrent();
-     resizeGL(width(), height());
-     updateGL();
-   }
-@@ -851,6 +853,8 @@
-   void MapCanvas::setHorizontalScroll(int x)
-   {
-     m_scrollX = x;
-+
-+    makeCurrent();
-     resizeGL(width(), height());
-     updateGL();
-   }
-@@ -858,6 +862,8 @@
-   void MapCanvas::setVerticalScroll(int y)
-   {
-     m_scrollY = y;
-+
-+    makeCurrent();
-     resizeGL(width(), height());
-     updateGL();
-   }
-@@ -867,6 +873,8 @@
-     m_scaleFactor += 0.05f;
-     if (m_scaleFactor > 2.0f)
-       m_scaleFactor -= 0.05f;
-+
-+    makeCurrent();
-     resizeGL(width(), height());
-     updateGL();
-   }
-@@ -876,6 +884,8 @@
-     m_scaleFactor -= 0.05f;
-     if (m_scaleFactor < 0.04f)
-       m_scaleFactor += 0.05f;
-+
-+    makeCurrent();
-     resizeGL(width(), height());
-     updateGL();
-   }

mmapper.spec

@@ -1,8 +1,6 @@
-%global extraversion final2
-
 Name:           mmapper
-Version:        2.0.4
-Release:        5.%{extraversion}%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Graphical MUME mapper
 
 Group:          Amusements/Games
@@ -10,19 +8,10 @@ Group:          Amusements/Games
 # LGPLv2 with exceptions or GPLv3 with exceptions:
 #  - src/3rdparty/qtiocompressor.cpp
 #  - src/3rdparty/qtiocompressor.h
-# The following files are GPLv2:
-#  - src/mapstorage/basemapsavefilter.cpp
-#  - src/mapstorage/basemapsavefilter.h
-#  - src/mapstorage/filesaver.cpp
-#  - src/mapstorage/filesaver.h
-#  - src/mapstorage/progresscounter.cpp
-#  - src/mapstorage/progresscounter.h
 # The rest of the source files are GPLv2+
 License:        GPLv2
 URL:            http://sourceforge.net/projects/mmapper
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{extraversion}-source.tar.gz
-Patch1:         mmapper-fix-renderer-crash.patch
-Patch2:         mmapper-2.0.4-no-add-needed.patch
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -39,9 +28,7 @@ data in real time and show player's position in a map.
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{extraversion}-source
-%patch1 -p0 -b .renderer-crash
-%patch2 -p1 -b .no-add-needed
+%setup -q -n %{name}-%{version}-source
 
 
 %build
@@ -82,7 +69,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS.txt ChangeLog.txt COPYING.txt doc/*.txt
+%doc ChangeLog.txt COPYING.txt doc/*.txt
 %doc src/3rdparty/LGPL_EXCEPTION.txt src/3rdparty/LICENSE.LGPL
 %{_bindir}/mmapper
 %{_datadir}/applications/mmapper.desktop
@@ -90,6 +77,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Aug 23 2010 Kalev Lember <kalev@smartlink.ee> - 2.1.0-1
+- Update to 2.1.0
+- Dropped upstreamed patches
+
 * Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-5.final2
 - Added patch to fix renderer crash with Qt 4.6
 - patch to fix linking with the new --no-add-needed default

sources

@@ -1 +1 @@
-ba690157374e51bf11291accb5de3b0e  mmapper-2.0.4-final2-source.tar.gz
+bd6ae25df875e57e819e72c57b40e403  mmapper-2.1.0-source.tar.gz