[wesnoth] 1.9.12.
Jon Ciesla
limb at fedoraproject.org
Sun Dec 11 01:04:32 UTC 2011
commit 35bf02e2a4a8107ed6527963edac1ae3e18fe601
Author: Jon Ciesla <limburgher at gmail.com>
Date: Sat Dec 10 19:04:17 2011 -0600
1.9.12.
.gitignore | 1 +
sources | 2 +-
wesnoth.spec | 140 ++++++++++++++++++++++++++++++++++++++-------------------
3 files changed, 95 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c1a40fc..5703ec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ wesnoth-1.8.3.tar.bz2
wesnoth-1.8.4.tar.bz2
/wesnoth-1.8.5.tar.bz2
/wesnoth-1.8.6.tar.bz2
+/wesnoth-1.9.12.tar.bz2
diff --git a/sources b/sources
index a036c72..8b9d2b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f1c3179869b01b61e253e74aeb241034 wesnoth-1.8.6.tar.bz2
+f13c2675128ed2ebb5d6db594a02098d wesnoth-1.9.12.tar.bz2
diff --git a/wesnoth.spec b/wesnoth.spec
index d12347a..2c6db0c 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,6 +1,6 @@
Name: wesnoth
-Version: 1.8.6
-Release: 5%{?dist}
+Version: 1.9.12
+Release: 1%{?dist}
Summary: Turn-based strategy game with a fantasy theme
Group: Amusements/Games
@@ -10,12 +10,12 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
Source1: wesnothd.init
Source2: %{name}.sysconfig
Patch0: %{name}-1.2.8-gcc43.patch
-Patch1: wesnoth-1.5.11-remove-ogg-test.patch
+#Patch1: wesnoth-1.5.11-remove-ogg-test.patch
#Patch2: wesnoth-1.6.4-fribidi.patch
#Patch3: wesnoth-1.8.3-boost-iostreams.patch
-Patch4: wesnoth-1.8.5-cstddef.patch
-Patch5: wesnoth-1.8.6-boost-foreach.patch
-Patch6: wesnoth-libpng15.patch
+#Patch4: wesnoth-1.8.5-cstddef.patch
+#Patch5: wesnoth-1.8.6-boost-foreach.patch
+#Patch6: wesnoth-libpng15.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: wesnoth-data = %{version}
@@ -32,9 +32,10 @@ BuildRequires: gettext
BuildRequires: boost-devel
BuildRequires: pango-devel
BuildRequires: lua-devel
+BuildRequires: cmake
# Drop these when ogg test patch is removed.
-BuildRequires: autoconf
-BuildRequires: automake
+#BuildRequires: autoconf
+#BuildRequires: automake
%description
The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
@@ -91,40 +92,58 @@ This package contains the data files for Wesnoth.
%prep
%setup -qn wesnoth-%{version}
%patch0 -p1 -b .gcc43
-%patch1 -p0
+#%patch1 -p0
#%patch2 -p0
#%patch3 -p1 -b .boost-iostreams
-%patch4 -p0 -b .cstddef
-%patch5 -p1 -b .boost-foreach
-%patch6 -p0 -b .libpng
-autoreconf -i
-
+#%patch4 -p0 -b .cstddef
+#%patch5 -p1 -b .boost-foreach
+#%patch6 -p0 -b .libpng
%build
# Cannot use configure macro because noarch-redhat-linux is not recognized by the auto tools in the tarball
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
-./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} \
- --disable-dependency-tracking \
- --with-localedir=%{_datadir}/locale \
- --enable-editor \
- --enable-tools \
- --enable-server \
- --enable-python \
- --with-fifodir=/var/run/wesnothd \
- --with-server-uid=$(id -u) \
- --with-server-gid=$(id -g) \
- --disable-strict-compilation
-#%ifnarch noarch
+#./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} \
+# --disable-dependency-tracking \
+# --with-localedir=%{_datadir}/locale \
+# --enable-editor \
+# --enable-tools \
+# --enable-server \
+# --enable-python \
+# --with-fifodir=/var/run/wesnothd \
+# --with-server-uid=$(id -u) \
+# --with-server-gid=$(id -g) \
+# --disable-strict-compilation
+cmake . -DCMAKE_INSTALL_PREFIX=${RPM_BUILD_ROOT}%{_prefix} -DDATAROOTDIR=%{_datadir} -DBINDIR=%{_bindir} -DENABLE_TOOLS=ON -DSERVER_UID=$(id -u) -DSERVER_GID=$(id -g) -DCMAKE_INSTALL_PREFIX=%{RPM_BUILD_ROOT}
+%ifnarch noarch
make %{?_smp_mflags}
-#%endif
+%endif
%install
rm -rf $RPM_BUILD_ROOT
+#make install
+mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
+for i in cutter exploder wesnoth; do
+ cp $i $RPM_BUILD_ROOT/%{_bindir}/
+done
+cp wesnothd $RPM_BUILD_ROOT/%{_sbindir}/
+pushd data
+pushd tools
+for i in wesnoth_addon_manager wml*; do
+ cp $i $RPM_BUILD_ROOT/%{_bindir}/
+done
+popd
+popd
+
#%ifarch noarch
### Data Files and Desktop Files
-make install-data DESTDIR=${RPM_BUILD_ROOT}
+#make install-data DESTDIR=${RPM_BUILD_ROOT}
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/wesnoth
+for i in data fonts icons images sounds; do
+ cp -pr $i $RPM_BUILD_ROOT/%{_datadir}/wesnoth/
+done
rm -rf $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
@@ -138,20 +157,45 @@ ln -sf ../wesnoth/icons/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
ln -sf ../wesnoth/icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
# Wesnoth ships its own fonts, replace with Fedora packaged versions
-rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/*
+rm -f $RPM_BUILD_ROOT/%{_datadir}/fonts/*
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/fonts
# dejavu-fonts
-ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/DejaVuSans.ttf
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT/%{_datadir}/fonts/DejaVuSans.ttf
# sazanami-fonts-gothic
-ln -s /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/sazanami-gothic.ttf
+ln -s /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf $RPM_BUILD_ROOT/%{_datadir}/fonts/sazanami-gothic.ttf
# wqy-zenhei-fonts
-ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/wqy-zenhei.ttc
-
-%find_lang %{name}.\*
-
+ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc $RPM_BUILD_ROOT/%{_datadir}/fonts/wqy-zenhei.ttc
+
+#So find_lang will work. . .
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/locale
+cp -pr translations/* $RPM_BUILD_ROOT/%{_datadir}/locale/
+
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man6
+pushd doc
+pushd man
+rm CMakeLists.txt
+rm cmake_install.cmake
+rm -rf CMakeFiles/
+rm Makefile
+mv *.6 $RPM_BUILD_ROOT/%{_mandir}/man6/
+for i in *; do
+ pushd $i
+ mkdir man6
+ if [ -f "*.6" ]; then
+ mv *.6 man6/
+ fi
+ popd
+done
+popd
+popd
+
+cp -pr doc/man/*/ $RPM_BUILD_ROOT/%{_mandir}
+
+%find_lang %{name}*.\*
#%else
### Binaries and Config Files
-make install-exec DESTDIR=${RPM_BUILD_ROOT}
+#make install-exec DESTDIR=${RPM_BUILD_ROOT}
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
--mode="0644" --vendor fedora \
@@ -160,7 +204,7 @@ desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
# arrange server package files
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
+#mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
mkdir -p ${RPM_BUILD_ROOT}/var/run/wesnothd
touch ${RPM_BUILD_ROOT}/var/run/wesnothd/socket
install -Dpm 755 %{SOURCE1} \
@@ -183,6 +227,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth-icon.png
rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth_editor-icon.png
rm -f $RPM_BUILD_ROOT/usr/share/applications/fedora-wesnoth_editor.desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -232,9 +277,7 @@ fi
%{_bindir}/wesnoth_addon_manager
%{_bindir}/exploder
%{_bindir}/cutter
-%{_bindir}/wmlindent
-%{_bindir}/wmllint
-%{_bindir}/wmlscope
+%{_bindir}/wml*
#%{_datadir}/applications/fedora-wesnoth_editor.desktop
%files server
@@ -247,21 +290,24 @@ fi
#%endif
#%ifarch noarch
-%files data -f %{name}.\*.lang
+%files data -f %{name}*.*.lang
%defattr(-,root,root,-)
%{_datadir}/%{name}
%{_datadir}/applications/fedora-wesnoth.desktop
%{_datadir}/pixmaps/*
-%{_mandir}/man6/wesnoth.6*
-%{_mandir}/*/man6/wesnoth.6*
-#%{_mandir}/man6/wesnoth_editor.6*
-#%{_mandir}/*/man6/wesnoth_editor.6*
-%{_mandir}/man6/wesnothd.*
-%{_mandir}/*/man6/wesnothd.*
+%{_datadir}/fonts/*
+%{_mandir}/*
#%endif
%changelog
+* Thu Dec 08 2011 Jon Ciesla <limb at jcomserv.net> - 1.9.12-1
+- Update to latest development release.
+- Dropped ogg-test patch.
+- Dropped cstddef patch, upstreamed.
+- Moved from autotools to cmake build system.
+- Could not get cmake install to work, did it my way.
+
* Sun Nov 20 2011 Bruno Wolff III <bruno at wolff.to> - 1.8.6-5
- Rebuild for boost soname bump
More information about the scm-commits
mailing list