Update to 2.2.0

.gitignore

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

mmapper-2.1.0-mirrored_textures.patch

@@ -1,29 +0,0 @@
-Index: src/display/mapcanvas.cpp
-===================================================================
---- src/display/mapcanvas.cpp	(revision 202)
-+++ src/display/mapcanvas.cpp	(revision 203)
-@@ -2706,6 +2706,7 @@
-     m_room_gllist = glGenLists(1);
-     glNewList(m_room_gllist, GL_COMPILE);
-     glBegin(GL_QUADS);
-+#if (QT_VERSION < 0x040700 || QT_VERSION >= 0x040800)
-     glTexCoord2d(0, 1);
-     glVertex3d(0.0, 0.0, 0.0);
-     glTexCoord2d(0, 0);
-@@ -2714,6 +2715,16 @@
-     glVertex3d(1.0, 1.0, 0.0);
-     glTexCoord2d(1, 1);
-     glVertex3d(1.0, 0.0, 0.0);
-+#else
-+    glTexCoord2d(0, 1);
-+    glVertex3d(0.0, 1.0, 0.0);
-+    glTexCoord2d(0, 0);
-+    glVertex3d(0.0, 0.0, 0.0);
-+    glTexCoord2d(1, 0);
-+    glVertex3d(1.0, 0.0, 0.0);
-+    glTexCoord2d(1, 1);
-+    glVertex3d(1.0, 1.0, 0.0);
-+#endif
-     glEnd();
-     glEndList();
- 

mmapper-2.1.0-system_qtiocompressor.patch

@@ -1,82 +0,0 @@
-diff -up mmapper-2.1.0-source/CMakeLists.txt.system_qtiocompressor mmapper-2.1.0-source/CMakeLists.txt
---- mmapper-2.1.0-source/CMakeLists.txt.system_qtiocompressor	2010-08-22 23:25:23.000000000 +0300
-+++ mmapper-2.1.0-source/CMakeLists.txt	2010-08-23 10:20:30.369359972 +0300
-@@ -9,6 +9,18 @@ include(${QT_USE_FILE})
- 
- find_package(OpenGL REQUIRED)
- 
-+# try to find system copy of qtiocompressor
-+find_path(QTIOCOMPRESSOR_INCLUDE_DIRS qtiocompressor.h PATH_SUFFIXES QtSolutions)
-+find_library(QTIOCOMPRESSOR_LIBRARIES QtSolutions_IOCompressor-2.3)
-+if (QTIOCOMPRESSOR_INCLUDE_DIRS AND QTIOCOMPRESSOR_LIBRARIES)
-+    message(STATUS "Found QtIOCompressor: ${QTIOCOMPRESSOR_LIBRARIES}")
-+else()
-+    message(STATUS "QtIOCompressor not found; using bundled copy.")
-+    add_subdirectory(src/3rdparty)
-+    set(QTIOCOMPRESSOR_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src/3rdparty)
-+    set(QTIOCOMPRESSOR_LIBRARIES qtiocompressor)
-+endif()
-+
- if (NOT MINGW)
-     find_package(ZLIB REQUIRED)
- else (NOT MINGW)
-diff -up mmapper-2.1.0-source/src/3rdparty/CMakeLists.txt.system_qtiocompressor mmapper-2.1.0-source/src/3rdparty/CMakeLists.txt
---- mmapper-2.1.0-source/src/3rdparty/CMakeLists.txt.system_qtiocompressor	2010-08-23 10:19:54.542587698 +0300
-+++ mmapper-2.1.0-source/src/3rdparty/CMakeLists.txt	2010-08-23 10:19:54.542587698 +0300
-@@ -0,0 +1,14 @@
-+set(qtiocompressor_SRCS
-+    qtiocompressor.cpp
-+)
-+
-+set(qtiocompressor_MOC_HDRS
-+    qtiocompressor.h
-+)
-+
-+QT4_WRAP_CPP(qtiocompressor_MOC_SRCS ${qtiocompressor_MOC_HDRS})
-+
-+ADD_LIBRARY(qtiocompressor STATIC
-+    ${qtiocompressor_SRCS}
-+    ${qtiocompressor_MOC_SRCS}
-+)
-diff -up mmapper-2.1.0-source/src/CMakeLists.txt.system_qtiocompressor mmapper-2.1.0-source/src/CMakeLists.txt
---- mmapper-2.1.0-source/src/CMakeLists.txt.system_qtiocompressor	2010-08-22 23:25:23.000000000 +0300
-+++ mmapper-2.1.0-source/src/CMakeLists.txt	2010-08-23 10:19:54.542587698 +0300
-@@ -1,6 +1,5 @@
- set(mmapper_SRCS
-     main.cpp
--    3rdparty/qtiocompressor.cpp
-     configuration/configuration.cpp
-     display/connectionselection.cpp
-     display/mapcanvas.cpp
-@@ -95,7 +94,6 @@ if (APPLE)
-  endif (APPLE)
- 
- set(mmapper_MOC_HDRS
--    3rdparty/qtiocompressor.h
-     display/connectionselection.h
-     display/mapcanvas.h
-     display/mapwindow.h
-@@ -147,7 +145,6 @@ set(mmapper_UIS
- include_directories(
-     ${CMAKE_CURRENT_BINARY_DIR}
-     ${CMAKE_CURRENT_SOURCE_DIR}
--    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty
-     ${CMAKE_CURRENT_SOURCE_DIR}/configuration
-     ${CMAKE_CURRENT_SOURCE_DIR}/display
-     ${CMAKE_CURRENT_SOURCE_DIR}/expandoracommon
-@@ -163,6 +160,7 @@ include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}/proxy
-     ${OPENGL_INCLUDE_DIR}
-     ${ZLIB_INCLUDE_DIR}
-+    ${QTIOCOMPRESSOR_INCLUDE_DIRS}
- )
- 
- QT4_WRAP_CPP(mmapper_MOC_SRCS ${mmapper_MOC_HDRS})
-@@ -187,6 +185,7 @@ target_link_libraries(mmapper
-     ${QT_LIBRARIES}
-     ${OPENGL_gl_LIBRARY}
-     ${ZLIB_LIBRARIES}
-+    ${QTIOCOMPRESSOR_LIBRARIES}
- )
- 
- # Begin CPack Settings

mmapper.spec

@@ -1,15 +1,12 @@
 Name:           mmapper
-Version:        2.1.0
-Release:        7%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Graphical MUME mapper
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/mmapper
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz
-# Backported patches from upstream svn
-Patch0:         mmapper-2.1.0-system_qtiocompressor.patch
-Patch1:         mmapper-2.1.0-mirrored_textures.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -28,8 +25,6 @@ data in real time and show player's position in a map.
 
 %prep
 %setup -q -n %{name}-%{version}-source
-%patch0 -p1 -b .system_qtiocompressor
-%patch1 -p0 -b .mirrored_textures
 
 # remove bundled copy of qtiocompressor
 rm -rf src/3rdparty
@@ -73,13 +68,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog.txt COPYING.txt doc/*.txt
+%doc COPYING.txt NEWS.txt doc/*.txt
 %{_bindir}/mmapper
 %{_datadir}/applications/mmapper.desktop
 %{_datadir}/icons/hicolor/*/apps/mmapper.png
 
 
 %changelog
+* Sat Jul 13 2013 Kalev Lember <kalevlember@gmail.com> - 2.2.0-1
+- Update to 2.2.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1 +1 @@
-bd6ae25df875e57e819e72c57b40e403  mmapper-2.1.0-source.tar.gz
+64a033cd1d6e78ce503f0ad1c7fe9a74  mmapper-2.2.0-source.tar.gz