Browse Source

wesnoth 1.14.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11684 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 6 years ago
parent
commit
14c9d4aec3
1 changed files with 23 additions and 19 deletions
  1. 23 19
      w/wesnoth/wesnoth-vl.spec

+ 23 - 19
w/wesnoth/wesnoth-vl.spec

@@ -10,8 +10,8 @@
 Summary:	Fantasy Turn-Based Strategy Game
 Summary(ja):	ターンベースのファンタジー戦略シミュレーションゲーム
 Name:		wesnoth
-Version:	1.12.6
-Release:	2%{?svn_rev:.svn%svn_rev}%{?_dist_release}
+Version:	1.14.1
+Release:	1%{?svn_rev:.svn%svn_rev}%{?_dist_release}
 Source0:	http://www.wesnoth.org/files/%{name}-%{version}%{?svn_rev:-svn%svn_rev}.tar.bz2
 Source1:	wesnothd.init
 # Source1:	wesnothd.service
@@ -25,8 +25,6 @@ Source12:	wesnoth-1.8.5_ja-catalogs-%{po_date}.zip
 %{?nosrc:NoSource: 0}
 
 Patch0:         wesnoth-1.2.8-gcc43.patch
-Patch8:         wesnoth-1.12.2-CVE-2015-5069.patch
-Patch9:         wesnoth-1.12.2-CVE-2015-5070.patch
 
 License:	GPLv2+
 Group:		Applications/Games
@@ -36,15 +34,14 @@ Distribution:	Vine Linux
 Vendor:		Project Vine
 Packager:	munepi, iwaim
 
-Requires:	SDL SDL_image SDL_mixer SDL_net SDL_ttf
 Requires:	freetype2 libpng zlib pango fontconfig
 Requires:	libboost-iostreams libboost-regex
 Requires:	TrueType-vlgothic TrueType-dejavu-sans TrueType-droid-sans
 BuildRequires:	cmake >= 2.6.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
-BuildRequires:	xorg-x11-devel SDL-devel SDL_image-devel SDL_mixer-devel 
-BuildRequires:	SDL_net-devel SDL_ttf-devel
+BuildRequires:	xorg-x11-devel SDL2-devel SDL2_image-devel SDL2_mixer-devel
+BuildRequires:	SDL2_ttf-devel
 BuildRequires:	freetype2-devel libpng-devel zlib-devel pango-devel
 BuildRequires:	fontconfig-devel
 BuildRequires:	libboost-devel >= 1.36
@@ -53,6 +50,7 @@ BuildRequires:	libboost-serialization
 BuildRequires:	libboost-program-options
 BuildRequires:	libboost-system
 BuildRequires:	libboost-thread
+BuildRequires:	libboost-random
 BuildRequires:	libboost-locale libboost-filesystem
 BuildRequires:	libvorbis-devel
 BuildRequires:	lua-devel
@@ -60,6 +58,7 @@ BuildRequires:	dbus-devel
 BuildRequires:	fribidi-devel
 BuildRequires:	python-devel
 BuildRequires:  scons
+BuildRequires:	openssl-devel
 %if %{with_unofficial_po}
 BuildRequires:	unzip
 %endif
@@ -120,9 +119,6 @@ Battle for Wesnoth はターンベースの戦略シミュレーションゲー
 %__rm -rf ${RPM_BUILD_ROOT}
 %setup -q -n %{name}-%{version}%{?svn_rev:-svn%svn_rev}
 %patch0 -p1 -b .gcc43
-#%patch7 -p0 -b .crash
-%patch8 -p0
-%patch9 -p0
 
 %if %{with_unofficial_po}
 %define japo_dir wesnoth-1.8.5ja-catalogs-%{po_date}
@@ -140,7 +136,7 @@ popd
 %endif
 
 %build
-scons wesnoth exploder cutter wesnothd campaignd \
+scons wesnoth wesnothd campaignd \
       prefix=%{_prefix} \
       bindir=%{_bindir} \
       libdir=%{_libdir} \
@@ -200,11 +196,12 @@ cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
 #     --mode="0644" --vendor vine \
 #     ../icons/%{name}.desktop
 # #%__install -m 644 icons/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-for size in 16x16 20x20 22x22 24x24 32x32 36x36 64x64 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512; do
-    %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps
-    convert icons/%{name}-icon.png -size ${size} \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/%{name}-icon.png
-done
+
+#for size in 16x16 20x20 22x22 24x24 32x32 36x36 64x64 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512; do
+#    %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps
+#    convert icons/%{name}-icon.png -size ${size} \
+#	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}/apps/%{name}-icon.png
+#done
 
 # desktop-file-install \
 #     --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
@@ -254,11 +251,12 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING changelog README.md copyright
+%doc COPYING changelog.md README.md copyright
 %docdir %{_docdir}/wesnoth
 %{_docdir}/wesnoth
 %{_bindir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/metainfo/wesnoth.appdata.xml
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/wesnoth.desktop
 %{_datadir}/wesnoth/fonts/*
@@ -270,8 +268,8 @@ fi
 %files tools
 %defattr(-,root,root)
 %{_bindir}/wesnoth_addon_manager
-%{_bindir}/exploder
-%{_bindir}/cutter
+#%{_bindir}/exploder
+#%{_bindir}/cutter
 %{_bindir}/wml*
 
 %files server
@@ -285,6 +283,12 @@ fi
 
 
 %changelog
+* Thu May 24 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 1.14.1-1
+- update to 1.14.1
+- drop unnecessary patches (Patch8, 9): upstream fixed
+- update BuildRequires
+ - require SDL2, openssl-devel, libboost-random
+
 * Mon Jan 08 2018 Toshiaki Ara <ara_t@384.jp> 1.12.6-2
 - rebuild with libboost-1.66.0