Procházet zdrojové kódy

update: wesnoth 1.8.0-1.svn41885

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@724 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim před 15 roky
rodič
revize
629282195b
1 změnil soubory, kde provedl 36 přidání a 4 odebrání
  1. 36 4
      w/wesnoth/wesnoth-vl.spec

+ 36 - 4
w/wesnoth/wesnoth-vl.spec

@@ -3,14 +3,27 @@
 %define with_campaignd 0
 %define with_wesnothd 0
 
-%define with_unofficial_po 1
+%define ver 1.8.0
+%define rel 1
+
+%define with_svn 1
+%if %{with_svn}
+%define svn_rev 41885
+%endif
+
+%define with_unofficial_po 0
 
 Summary: Fantasy Turn-Based Strategy Game
 Summary(ja):  ターンベースのファンタジー戦略シミュレーションゲーム
 Name: wesnoth
-Version: 1.6.5
-Release: 3%{?_dist_release}
+Version: %{ver}
+%if %{with_svn}
+Release: %{rel}.svn%{svn_rev}%{?_dist_release}
+Source0: %{name}-%{version}-svn%{svn_rev}.tar.bz2
+%else
+Release: %{rel}%{?_dist_release}
 Source0: %{name}-%{version}.tar.bz2
+%endif
 Source1: wesnothd.init
 Source2: %{name}.sysconfig
 %if %{with_unofficial_po}
@@ -47,10 +60,13 @@ BuildRequires: SDL_net-devel SDL_ttf-devel
 BuildRequires: freetype2-devel libpng-devel zlib-devel pango-devel
 BuildRequires: fontconfig-devel
 BuildRequires: libboost-devel libboost-iostreams libboost-regex
+BuildRequires: lua-devel
 #BuildRequires: fribidi-devel
 #BuildRequires: python-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+Conflicts: wesnoth156
+
 %description
 Battle for Wesnoth is a fantasy turn-based strategy game. Battle for
 control of villages, using variety of units which have advantages and
@@ -140,7 +156,11 @@ Battle for Wesnoth はターンベースの戦略シミュレーションゲー
 %prep
 %__rm -rf ${RPM_BUILD_ROOT}
 
+%if %{with_svn}
+%setup -q -n %{name}-%{version}-svn%{svn_rev}
+%else
 %setup -q
+%endif
 
 %if %{with_unofficial_po}
 %patch10 -p1
@@ -184,6 +204,9 @@ popd
 
 %build
 export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" 
+%if %{with_svn}
+./autogen.sh
+%endif
 %configure \
     --disable-dependency-tracking \
 %if %{with_editor}
@@ -223,6 +246,7 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/%{name}/fonts/
 %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 .
@@ -379,9 +403,17 @@ fi
 
 
 %changelog
+* Tue Mar 30 2010 IWAI, Masaharu <iwai@alib.jp> 1.8.0-1.svn41885
+- update to 1.8.0+svn41885
+- add Conflicts: wesnoth165
+- without unofficial po files (Source10): unstream merged
+- symbolic link: VL-Gothic-Regular.ttf to wqy-zenhei.ttc
+- add BuildRequires: lua-devel
+- fix changelog: 1.6.5-3
+
 * Mon Mar 29 2010 IWAI, Masaharu <iwai@alib.jp> 1.6.5-3
 - add unofficial Japanese po files
-  - add wesnoth-1.6.5-japanese-po.zip (Source10)
+  - add wesnoth-1.6.5-japanese-po.tar.gz (Source10)
   - add wesnoth-1.6.5-sotbe-ja.po (Source11)
   - add Japanese translators patch (Patch10)
 - update Packager: assign iwaim