[mmapper/el6/master] Update to 2.1.0
Kalev Lember
kalev at fedoraproject.org
Tue Jan 18 07:10:52 UTC 2011
commit 7b74b9f995d8cd65b4ae42701411798907d0840d
Author: Kalev Lember <kalev at smartlink.ee>
Date: Mon Aug 23 08:30:48 2010 +0300
Update to 2.1.0
.gitignore | 1 +
mmapper-fix-renderer-crash.patch | 49 --------------------------------------
mmapper.spec | 25 +++++++------------
sources | 2 +-
4 files changed, 11 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d283c3..47ddbdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mmapper-2.0.4-final2-source.tar.gz
+/mmapper-2.1.0-source.tar.gz
diff --git a/mmapper.spec b/mmapper.spec
index 65d8ff7..d35f1f4 100644
--- a/mmapper.spec
+++ b/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,18 +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
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
@@ -38,8 +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
+%setup -q -n %{name}-%{version}-source
%build
@@ -80,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
@@ -88,6 +77,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Aug 23 2010 Kalev Lember <kalev at smartlink.ee> - 2.1.0-1
+- Update to 2.1.0
+- Dropped upstreamed patches
+
* Thu Feb 25 2010 Kalev Lember <kalev at smartlink.ee> - 2.0.4-5.final2
- Added patch to fix renderer crash with Qt 4.6
diff --git a/sources b/sources
index edac1a2..142b56e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba690157374e51bf11291accb5de3b0e mmapper-2.0.4-final2-source.tar.gz
+bd6ae25df875e57e819e72c57b40e403 mmapper-2.1.0-source.tar.gz
More information about the scm-commits
mailing list