dist-git conversion

- Updated source URL.

.gitignore

@@ -0,0 +1 @@
+mmapper-2.0.4-final2-source.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mmapper
-# $Id$
-NAME := mmapper
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

mmapper-fix-renderer-crash.patch

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,104 @@
+%global extraversion final2
+
+Name:           mmapper
+Version:        2.0.4
+Release:        5.%{extraversion}%{?dist}
+Summary:        Graphical MUME mapper
+
+Group:          Amusements/Games
+# The following files are dual licensed under
+# 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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
+BuildRequires:  qt4-devel
+Requires:       hicolor-icon-theme
+
+%description
+MMapper is a graphical mapper for a MUD named MUME (Multi-Users in Middle
+Earth). The game is traditionally played in a text-only mode, but MMapper tries
+to represent the virtual world in user-friendly graphical environment. It acts
+as a proxy between a telnet client and a MUD server, being able to analyze game
+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
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+# It is questionable if one is allowed to redistribute the map.
+rm -f $RPM_BUILD_ROOT/%{_datadir}/games/mmapper/arda.mm2
+
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mmapper.desktop
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS.txt ChangeLog.txt COPYING.txt doc/*.txt
+%doc src/3rdparty/LGPL_EXCEPTION.txt src/3rdparty/LICENSE.LGPL
+%{_bindir}/mmapper
+%{_datadir}/applications/mmapper.desktop
+%{_datadir}/icons/hicolor/*/apps/mmapper.png
+
+
+%changelog
+* Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-5.final2
+- Added patch to fix renderer crash with Qt 4.6
+
+* Thu Feb 25 2010 Kalev Lember <kalev@smartlink.ee> - 2.0.4-4.final2
+- Rebuilt with Qt 4.6
+
+* Mon Nov 23 2009 Kalev Lember <kalev@smartlink.ee> - 2.0.4-3.final2
+- Updated source URL.
+
+* Tue Aug 11 2009 Kalev Lember <kalev@smartlink.ee> - 2.0.4-2.final2
+- Changed license tag to read "GPLv2" as there is GPLv2-only code in the mix.
+
+* Fri Aug 07 2009 Kalev Lember <kalev@smartlink.ee> - 2.0.4-1.final2
+- Initial RPM release.

sources

@@ -0,0 +1 @@
+ba690157374e51bf11291accb5de3b0e  mmapper-2.0.4-final2-source.tar.gz