Browse Source

wesnoth 1.8.6-2

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

+ 6 - 13
w/wesnoth/wesnoth-vl.spec

@@ -5,7 +5,7 @@
 
 %define ver 1.8.6
 %define src_ver %{ver}
-%define rel 1
+%define rel 2
 
 %define with_svn 0
 %if %{with_svn}
@@ -41,15 +41,10 @@ Distribution: Vine Linux
 Vendor:       Project Vine
 Packager:     munepi, iwaim
 
-Requires: xorg-x11-libs SDL SDL_image SDL_mixer SDL_net SDL_ttf
+Requires: SDL SDL_image SDL_mixer SDL_net SDL_ttf
 Requires: freetype2 libpng zlib pango fontconfig
 Requires: libboost-iostreams libboost-regex
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
 Requires: TrueType-vlgothic
-%endif
-%if %{?_dist_release} == "vl4"
-Requires: TrueType-sazanami
-%endif
 BuildRequires: desktop-file-utils
 BuildRequires: ImageMagick
 BuildRequires: xorg-x11-devel SDL-devel SDL_image-devel SDL_mixer-devel 
@@ -221,14 +216,8 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/fonts/
 ## for 1.6a or higher (NOT contains sazanami-gothic.ttf)
 %{__rm} -f wqy-zenhei.ttc
 
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
-#ln -s /usr/share/fonts/TrueType-sazanami-gothic/sazanami-gothic.ttf .
 ln -s /usr/share/fonts/TrueType-vlgothic/VL-PGothic-Regular.ttf sazanami-gothic.ttf
 ln -s /usr/share/fonts/TrueType-vlgothic/VL-Gothic-Regular.ttf wqy-zenhei.ttc
-%endif
-%if %{?_dist_release} == "vl4"
-ln -s /usr/X11R6/lib/X11/fonts/TrueType/sazanami-gothic.ttf .
-%endif
 popd
 
 ### for Gnome menu
@@ -381,6 +370,10 @@ fi
 
 
 %changelog
+* Mon Sep  5 2011 IWAI, Masaharu <iwai@alib.jp> 1.8.6-2
+- drop Requires: xorg-x11-libs
+- drop unnecessary routine for Vine Linux 4
+
 * Sun May 15 2011 IWAI, Masaharu <iwai@alib.jp> 1.8.6-1
 - new upstream release