[tiled] Initial import (#853784)

Erik Schilling ablu at fedoraproject.org
Fri Sep 14 16:44:43 UTC 2012


commit 9d9c7bf9ae01fe69142f5bb84f13cc5ab450d3a4
Author: Erik Schilling <ablu.erikschilling at googlemail.com>
Date:   Fri Sep 14 18:44:26 2012 +0200

    Initial import (#853784)

 .gitignore                            |    1 +
 sources                               |    1 +
 tiled-incorrect-fsf-address-fix.patch |   99 ++++++++++++++++++++
 tiled-license-header-fix.patch        |  126 +++++++++++++++++++++++++
 tiled-qmake-rpath-fix.patch           |   78 ++++++++++++++++
 tiled.1                               |  164 +++++++++++++++++++++++++++++++++
 tiled.desktop                         |    9 ++
 tiled.png                             |  Bin 0 -> 1437 bytes
 tiled.spec                            |  102 ++++++++++++++++++++
 tmxviewer.1                           |   78 ++++++++++++++++
 10 files changed, 658 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..2526fbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/tiled-qt-0.8.1.tar.gz
diff --git a/sources b/sources
index e69de29..4f66f05 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2a8b42e5b956562a184ab0f2b926cac7  tiled-qt-0.8.1.tar.gz
diff --git a/tiled-incorrect-fsf-address-fix.patch b/tiled-incorrect-fsf-address-fix.patch
new file mode 100644
index 0000000..86de470
--- /dev/null
+++ b/tiled-incorrect-fsf-address-fix.patch
@@ -0,0 +1,99 @@
+diff --git a/LICENSE.GPL b/LICENSE.GPL
+index 32d0e60..d159169 100644
+--- a/LICENSE.GPL
++++ b/LICENSE.GPL
+@@ -1,12 +1,12 @@
+-		    GNU GENERAL PUBLIC LICENSE
+-		       Version 2, June 1991
++                    GNU GENERAL PUBLIC LICENSE
++                       Version 2, June 1991
+ 
+- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+-			    Preamble
++                            Preamble
+ 
+   The licenses for most software are designed to take away your
+ freedom to share and change it.  By contrast, the GNU General Public
+@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
+ General Public License applies to most of the Free Software
+ Foundation's software and to any other program whose authors commit to
+ using it.  (Some other Free Software Foundation software is covered by
+-the GNU Library General Public License instead.)  You can apply it to
++the GNU Lesser General Public License instead.)  You can apply it to
+ your programs, too.
+ 
+   When we speak of free software, we are referring to freedom, not
+@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
+   The precise terms and conditions for copying, distribution and
+ modification follow.
+ 
+-		    GNU GENERAL PUBLIC LICENSE
++                    GNU GENERAL PUBLIC LICENSE
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
+   0. This License applies to any program or other work which contains
+@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
+ of preserving the free status of all derivatives of our free software and
+ of promoting the sharing and reuse of software generally.
+ 
+-			    NO WARRANTY
++                            NO WARRANTY
+ 
+   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+ 
+-		     END OF TERMS AND CONDITIONS
++                     END OF TERMS AND CONDITIONS
+ 
+-	    How to Apply These Terms to Your New Programs
++            How to Apply These Terms to Your New Programs
+ 
+   If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
+ the "copyright" line and a pointer to where the full notice is found.
+ 
+     <one line to give the program's name and a brief idea of what it does.>
+-    Copyright (C) 19yy  <name of author>
++    Copyright (C) <year>  <name of author>
+ 
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+ 
+-    You should have received a copy of the GNU General Public License
+-    along with this program; if not, write to the Free Software
+-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-
++    You should have received a copy of the GNU General Public License along
++    with this program; if not, write to the Free Software Foundation, Inc.,
++    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Also add information on how to contact you by electronic and paper mail.
+ 
+ If the program is interactive, make it output a short notice like this
+ when it starts in an interactive mode:
+ 
+-    Gnomovision version 69, Copyright (C) 19yy name of author
++    Gnomovision version 69, Copyright (C) year name of author
+     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This is free software, and you are welcome to redistribute it
+     under certain conditions; type `show c' for details.
+@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
+ This General Public License does not permit incorporating your program into
+ proprietary programs.  If your program is a subroutine library, you may
+ consider it more useful to permit linking proprietary applications with the
+-library.  If this is what you want to do, use the GNU Library General
++library.  If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
diff --git a/tiled-license-header-fix.patch b/tiled-license-header-fix.patch
new file mode 100644
index 0000000..1c08ab6
--- /dev/null
+++ b/tiled-license-header-fix.patch
@@ -0,0 +1,126 @@
+diff --git a/src/libtiled/gidmapper.cpp b/src/libtiled/gidmapper.cpp
+index aca1a7f..8bb92fc 100644
+--- a/src/libtiled/gidmapper.cpp
++++ b/src/libtiled/gidmapper.cpp
+@@ -4,18 +4,26 @@
+  *
+  * This file is part of libtiled.
+  *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by the Free
+- * Software Foundation; either version 2 of the License, or (at your option)
+- * any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
+  *
+- * This program is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+- * more details.
++ *    1. Redistributions of source code must retain the above copyright notice,
++ *       this list of conditions and the following disclaimer.
+  *
+- * You should have received a copy of the GNU General Public License along with
+- * this program. If not, see <http://www.gnu.org/licenses/>.
++ *    2. Redistributions in binary form must reproduce the above copyright
++ *       notice, this list of conditions and the following disclaimer in the
++ *       documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
++ * EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
++ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include "gidmapper.h"
+diff --git a/src/libtiled/gidmapper.h b/src/libtiled/gidmapper.h
+index 803db67..4bec8e0 100644
+--- a/src/libtiled/gidmapper.h
++++ b/src/libtiled/gidmapper.h
+@@ -4,18 +4,26 @@
+  *
+  * This file is part of libtiled.
+  *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by the Free
+- * Software Foundation; either version 2 of the License, or (at your option)
+- * any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
+  *
+- * This program is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+- * more details.
++ *    1. Redistributions of source code must retain the above copyright notice,
++ *       this list of conditions and the following disclaimer.
+  *
+- * You should have received a copy of the GNU General Public License along with
+- * this program. If not, see <http://www.gnu.org/licenses/>.
++ *    2. Redistributions in binary form must reproduce the above copyright
++ *       notice, this list of conditions and the following disclaimer in the
++ *       documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
++ * EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
++ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #ifndef TILED_GIDMAPPER_H
+diff --git a/src/libtiled/maprenderer.cpp b/src/libtiled/maprenderer.cpp
+index 719bd42..46a8c2a 100644
+--- a/src/libtiled/maprenderer.cpp
++++ b/src/libtiled/maprenderer.cpp
+@@ -2,20 +2,28 @@
+  * maprenderer.cpp
+  * Copyright 2011, Thorbjørn Lindeijer <thorbjorn at lindeijer.nl>
+  *
+- * This file is part of Tiled.
++ * This file is part of libtiled.
+  *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by the Free
+- * Software Foundation; either version 2 of the License, or (at your option)
+- * any later version.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
+  *
+- * This program is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+- * more details.
++ *    1. Redistributions of source code must retain the above copyright notice,
++ *       this list of conditions and the following disclaimer.
+  *
+- * You should have received a copy of the GNU General Public License along with
+- * this program. If not, see <http://www.gnu.org/licenses/>.
++ *    2. Redistributions in binary form must reproduce the above copyright
++ *       notice, this list of conditions and the following disclaimer in the
++ *       documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
++ * EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
++ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+ #include "maprenderer.h"
diff --git a/tiled-qmake-rpath-fix.patch b/tiled-qmake-rpath-fix.patch
new file mode 100644
index 0000000..bca502e
--- /dev/null
+++ b/tiled-qmake-rpath-fix.patch
@@ -0,0 +1,78 @@
+diff --git a/README.md b/README.md
+index e5381dd..eedf05a 100644
+--- a/README.md
++++ b/README.md
+@@ -48,11 +48,11 @@ You can now simply run Tiled using bin/tiled.
+ Installing
+ -------------------------------------------------------------------------------
+ 
+-For installing Tiled you can run 'make install'. By default Tiled will install
+-to /usr/local. You can change this prefix when running qmake, and/or you can
++For installing Tiled you can run `make install`. By default Tiled will install
++to `/usr/local`. You can change this prefix when running qmake, and/or you can
+ change the install root when running make install, as follows:
+ 
+-Use /usr instead of /usr/local:
++Use `/usr` instead of `/usr/local`:
+ 
+     $ qmake -r PREFIX=/usr
+ 
+@@ -63,3 +63,7 @@ Install to some packaging directory:
+ 
+     $ make install INSTALL_ROOT=/tmp/tiled-pkg
+ 
++By default, Tiled and its plugins are compiled with an Rpath so that they can
++find the shared libtiled library when running it straight after compile. When
++packaging for a distribution, this Rpath should generally be disabled by
++appending `RPATH=no` to the qmake command.
+diff --git a/src/plugins/plugin.pri b/src/plugins/plugin.pri
+index ae1f294..4c0831c 100644
+--- a/src/plugins/plugin.pri
++++ b/src/plugins/plugin.pri
+@@ -27,7 +27,7 @@ macx {
+ }
+ 
+ # Set rpath so that the plugin will resolve libtiled correctly
+-!win32:!macx {
++!win32:!macx:contains(RPATH, yes) {
+     QMAKE_RPATHDIR += \$\$ORIGIN/../..
+ 
+     # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
+diff --git a/src/tiled/tiled.pro b/src/tiled/tiled.pro
+index a47bce0..15905e9 100644
+--- a/src/tiled/tiled.pro
++++ b/src/tiled/tiled.pro
+@@ -29,7 +29,7 @@ macx {
+ }
+ 
+ # Make sure the Tiled executable can find libtiled
+-!win32:!macx {
++!win32:!macx:contains(RPATH, yes) {
+     QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ 
+     # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
+diff --git a/src/tmxviewer/tmxviewer.pro b/src/tmxviewer/tmxviewer.pro
+index 88e5b61..3bb0d48 100644
+--- a/src/tmxviewer/tmxviewer.pro
++++ b/src/tmxviewer/tmxviewer.pro
+@@ -26,7 +26,7 @@ macx {
+ }
+ 
+ # Make sure the executable can find libtiled
+-!win32:!macx {
++!win32:!macx:contains(RPATH, yes) {
+     QMAKE_RPATHDIR += \$\$ORIGIN/../lib
+ 
+     # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
+diff --git a/tiled.pri b/tiled.pri
+index 9f7daaf..9598197 100644
+--- a/tiled.pri
++++ b/tiled.pri
+@@ -1,6 +1,7 @@
+ # See the README file for instructions about setting the install prefix.
+ isEmpty(PREFIX):PREFIX = /usr/local
+ isEmpty(LIBDIR):LIBDIR = $${PREFIX}/lib
++isEmpty(RPATH):RPATH = yes
+ 
+ macx {
+     # Do a universal build when possible
diff --git a/tiled.1 b/tiled.1
new file mode 100644
index 0000000..bbc3bc6
--- /dev/null
+++ b/tiled.1
@@ -0,0 +1,164 @@
+'\" t
+.\"     Title: TILED-QT
+.\"    Author: Ying-Chun Liu <paulliu at debian.org>
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 09/02/2012
+.\"    Manual: tiled User Manual
+.\"    Source: tiled
+.\"  Language: English
+.\"
+.TH "TILED\-QT" "1" "09/02/2012" "tiled" "tiled User Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+tiled \- general purpose tile map editor
+.SH "SYNOPSIS"
+.HP \w'\fBtiled\fR\ 'u
+\fBtiled\fR [{\fB\-h\fR\ |\ \fB\-\-help\fR} | {\fB\-v\fR\ |\ \fB\-\-version\fR}] [\fIfilename\fR]
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBtiled\fR
+command\&.
+.PP
+This manual page was written for the Debian distribution because the original program does not have a manual page\&.
+.PP
+\fBtiled\fR
+is a program to edit tiled maps\&. The main features:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+General purpose tile map editor with XML\-based map format
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Supports orthogonal and isometric maps
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Custom objects can be placed with pixel precision
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Full undo/redo and copy/paste support
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Add custom properties to tiles, layers, objects or the map
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Automatically reloads tilesets when changed externally
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Resize or offset your tile map later as needed
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Efficient tile editing tools like stamp and fill brushes
+.RE
+.sp
+.SH "OPTIONS"
+.PP
+The program follows the usual GNU command line syntax, with long options starting with two dashes (`\-\*(Aq)\&. A summary of options is included below\&.
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Show summary of options\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-version\fR
+.RS 4
+Show version of program\&.
+.RE
+.SH "AUTHOR"
+.PP
+\fBYing\-Chun Liu\fR <\&paulliu at debian\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2010 Ying-Chun Liu (PaulLiu)
+.br
+.PP
+This manual page was written for the Debian system (and may be used by others)\&.
+.PP
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or (at your option) any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in
+/usr/share/common\-licenses/GPL\-2\&.
+.sp
diff --git a/tiled.desktop b/tiled.desktop
new file mode 100644
index 0000000..6a92089
--- /dev/null
+++ b/tiled.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Tiled
+Comment=Tiled Map Editor
+Exec=/usr/bin/tiled
+Terminal=false
+Type=Application
+Icon=/usr/share/tiled/images/tiled.png
+Categories=Graphics;2DGraphics;
+X-Desktop-File-Install-Version=0.1
diff --git a/tiled.png b/tiled.png
new file mode 100644
index 0000000..643017f
Binary files /dev/null and b/tiled.png differ
diff --git a/tiled.spec b/tiled.spec
new file mode 100644
index 0000000..5571ad9
--- /dev/null
+++ b/tiled.spec
@@ -0,0 +1,102 @@
+Name:           tiled
+Version:        0.8.1
+Release:        3%{?dist}
+Summary:        Tiled Map Editor
+# tiled itself is GPLv2+, libtiled and tmxviewer are BSD
+License:        GPLv2+ and BSD
+URL:            http://www.mapeditor.org
+Source0:        http://sourceforge.net/projects/%{name}/files/%{name}-qt/%{version}/%{name}-qt-%{version}.tar.gz
+# Manpages
+Source1:        tiled.1
+Source2:        tmxviewer.1
+# Icon for desktop file
+Source3:        tiled.png
+# Desktop file
+Source4:        tiled.desktop
+
+# Fix for wrong fsf address:
+# See https://github.com/bjorn/tiled/commit/cf42b8a60a236eb97486c1ccf8497bddb51a608a
+# for upstream fix
+Patch0:         tiled-incorrect-fsf-address-fix.patch
+# Fix for rpath option in qmake
+# See https://github.com/bjorn/tiled/commit/8130d2c76a5946e373d88111373f3d9f9f082132
+# for upstream fix
+Patch1:         tiled-qmake-rpath-fix.patch
+# Fix for license headers that were forgotten to adapt during relicensing to BSD
+# See https://github.com/bjorn/tiled/commit/608767766c6c9518276ab0aa3fa35671b59267a1
+# for upstream fix
+Patch2:         tiled-license-header-fix.patch
+
+BuildRequires:  qt4-devel
+BuildRequires:  desktop-file-utils
+
+%description
+Tiled is a general purpose tile map editor. It's built to be easy to use,
+yet flexible enough to work with varying game engines, whether your game
+is an RPG, platformer or Breakout clone. Tiled is free software and written
+in C++, using the Qt application framework.
+
+This package contains the tiled application and tmxviewer, a simple application
+to view Tiled maps.
+
+%prep
+%setup -q -n %{name}-qt-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+# Remove copy of zlib
+rm -rf src/zlib
+
+%build
+qmake-qt4 -r PREFIX=%{_prefix} LIBDIR=%{_libdir} RPATH=no
+make %{?_smp_mflags}
+
+%install
+make install INSTALL_ROOT=%{buildroot}
+# Clean build artefacts
+find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf
+# Install manpages
+install -D -p -m 644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/%{name}.1
+install -D -p -m 644 %{SOURCE2} %{buildroot}/%{_mandir}/man1/tmxviewer.1
+# Install desktop file and icon
+install -D -p -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/images/%{name}.png
+install -D -p -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/applications/%{name}.desktop
+# Validate desktop file
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+# locale files
+%find_lang %{name} --with-qt
+# Removed development file (this version does not install headers anyway)
+rm %{buildroot}/%{_libdir}/lib%{name}.so
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%doc AUTHORS NEWS README.md COPYING LICENSE.GPL LICENSE.BSD
+%{_bindir}/%{name}
+%{_bindir}/tmxviewer
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/images
+%dir %{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/translations
+%{_libdir}/lib%{name}.so.*
+%{_libdir}/%{name}
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/tmxviewer.1*
+
+%changelog
+* Mon Sep 3 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.8.1-3
+- Fixed preserving of timestamps in install command.
+- Fixed typo in permission setting.
+- Talked with upstream about license mismatch in headers.
+- Those headers were outdated.
+
+* Mon Sep 3 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.8.1-2
+- Added note about which parts are licensed with which license.
+- Made sure that the copy of zlib inside of the source is removed.
+- Fixed handling of locales (using %%find_lang).
+- Avoided plain asterisks in %%files.
+- Made description clear about containing the tmxviewer.
+
+* Sun Sep 2 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.8.1-1
+- First version for official fedora repos.
diff --git a/tmxviewer.1 b/tmxviewer.1
new file mode 100644
index 0000000..3cb3f04
--- /dev/null
+++ b/tmxviewer.1
@@ -0,0 +1,78 @@
+'\" t
+.\"     Title: TILED-QT
+.\"    Author: Ying-Chun Liu <paulliu at debian.org>
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 09/02/2012
+.\"    Manual: tmxviewer User Manual
+.\"    Source: tmxviewer
+.\"  Language: English
+.\"
+.TH "TILED\-QT" "1" "09/02/2012" "tmxviewer" "tmxviewer User Manual"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+tmxviewer \- program to view tmx files
+.SH "SYNOPSIS"
+.HP \w'\fBtmxviewer\fR\ 'u
+\fBtmxviewer\fR [{\fB\-h\fR\ |\ \fB\-\-help\fR}] [{\fB\-v\fR\ |\ \fB\-\-version\fR}] [file]
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBtmxviewer\fR
+commands
+.PP
+This manual page was written for the Debian distribution because the original program does not have a manual page\&.
+.PP
+\fBtmxviewer\fR
+is a program that views tmx map file\&. It pops a window and let you browse the map\&.
+.SH "OPTIONS"
+.PP
+The program follows the usual GNU command line syntax, with long options starting with two dashes (`\-\*(Aq)\&. A summary of options is included below\&.
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Show summary of options\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-version\fR
+.RS 4
+Show version of program\&.
+.RE
+.SH "SEE ALSO"
+.PP
+\fBtiled\fR(1)
+.SH "AUTHOR"
+.PP
+\fBYing\-Chun Liu\fR <\&paulliu at debian\&.org\&>
+.RS 4
+Wrote this manpage for the Debian system\&.
+.RE
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2011 Ying-Chun Liu (PaulLiu)
+.br
+.PP
+This manual page was written for the Debian system (and may be used by others)\&.
+.PP
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or (at your option) any later version published by the Free Software Foundation\&.
+.PP
+On Debian systems, the complete text of the GNU General Public License can be found in
+/usr/share/common\-licenses/GPL\-2\&.
+.sp


More information about the scm-commits mailing list