Vine Linux 6 向けに更新

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4178 ec354946-7b23-47d6-9f5a-488ba84defc7

a/airstrike/airstrike-vl.spec

@@ -1,18 +1,12 @@
 Name:      airstrike
-#Version:   pre6a
 Version:   1.0
-#Release:   0vl1.pre6
-Release:   1.pre6%{?_dist_release}
+Release:   2.pre6%{?_dist_release}
 Summary:   2D Air combat
 Summary(ja):   複葉機による二次元対戦ゲーム
 Vendor: Project Vine
 Distribution: Vine Linux
 
 URL:       http://icculus.org/airstrike/
-#Packager:  Michal Ambroz <rebus@seznam.cz>
-Packager: OOI Keita <ooik.ovwqlsjxcqwg4dc@privango.jp>
-
-#Source0:   %{name}-%{version}-src.tar.gz
 Source0:   %{name}-pre6a-src.tar.gz
 Source1:   %{name}48x48.png
 Source2:   %{name}.desktop
@@ -31,13 +25,12 @@ robust physics engine and several  other  extensions  of  the original
 games.
 
 %description -l ja
-IntellivisionとAmigaのゲーム、'Biplanes'と'BIP'に似た、2Dの複葉機対戦ゲーム
-です。元になったゲームに比べ、強健な物理エンジンと新たに追加された
+IntellivisionとAmigaのゲーム、'Biplanes'と'BIP'に似た、2Dの複葉機対戦
+ゲームです。元になったゲームに比べ、強健な物理エンジンと新たに追加された
 拡張機能が特徴です。
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-#%setup -q -n %{name}-%{version}-src
 %setup -q -n %{name}-pre6a-src
 %patch0 -p1
 
@@ -45,7 +38,6 @@ rm -rf $RPM_BUILD_ROOT
 make airstrike-sound
 
 %install
-
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/data
@@ -77,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man6/*
 
 %changelog
+* Sat Jun 18 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 1.0-2.pre6
+- rebuild for Vine Linux 6
+
 * Sat Aug 16 2008 Shu KONNO <owa@bg.wakwak.com> 1.0-1.pre6vl5
 - applied new versioning policy, spec in utf-8
 

m/missile/missile-vl.spec

@@ -1,13 +1,10 @@
-%define prefix /usr
-
 Summary: A clone of the Atari save-your-city-from-impending-nuclear-doom game.
 Summary(ja): ミサイルで都市を防衛するゲーム
 Name: missile
-Prefix: %prefix
 Version: 1.0.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
-Url: http://missile.sourceforge.net/
+URL: http://missile.sourceforge.net/
 Group: Applications/Games
 Source: missile-%{version}.tar.gz
 Patch0: missile.userbuild.patch
@@ -18,7 +15,7 @@ BuildRequires: SDL-devel, SDL_image-devel, SDL_mixer-devel
 Requires: SDL, SDL_image, SDL_mixer
 Vendor: Project Vine
 Distribution: Vine Linux
-Packager: OOI Keita <ooik.ovwqlsjxcqwg4dc@privango.jp>
+#Packager: OOI Keita <ooik.ovwqlsjxcqwg4dc@privango.jp>
 
 %description
 Protect your city from nuclear disaster by destroying incoming 
@@ -33,11 +30,11 @@ warheads with your anti-missile SAMs.
 %patch1 -p1
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" game_prefix=%{prefix}
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" game_prefix=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install game_prefix=$RPM_BUILD_ROOT%{prefix}
+make install game_prefix=$RPM_BUILD_ROOT%{_prefix}
 
 #hackery to get the conf files in the right places
 #make create_etc_conf game_prefix=%{prefix}
@@ -55,19 +52,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,games)
 %doc README INSTALL COPYING.GPL missile.kdelnk
 # %config /etc/missilecommand.conf
-
-%{prefix}/bin/missile
-%{prefix}/share/missile
-%{prefix}/share/pixmaps/missile_icon_black.png
-%{prefix}/share/pixmaps/missile_icon_blue.png
-%{prefix}/share/pixmaps/missile_icon_green.png
-%{prefix}/share/pixmaps/missile_icon_red.png
-%{prefix}/share/pixmaps/missile_icon_white.png
-%{prefix}/share/pixmaps/missile_icon_yellow.png
+%{_bindir}/missile
+%{_datadir}/missile
+%{_datadir}/pixmaps/missile_icon_*.png
 %{_datadir}/applications/
 
-
 %changelog
+* Sat Jun 18 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 1.0.1-2
+- rebuild for Vine Linux 6
+
 * Sat Oct 04 2008 Shu KONNO <owa@bg.wakwak.com> 1.0.1-1vl5
 - applied new versioning policy, spec in utf-8
 

p/planner/planner-vl.spec

@@ -2,9 +2,12 @@ Summary:	A graphical project management tool.
 Summary(ja):	グラフィカルなプロジェクト管理ツール
 Name:		planner
 Version:	0.14.4
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 URL:		http://live.gnome.org/Planner
 Source0:	%{name}-%{version}.tar.bz2
+# Patch0: refer https://bugzilla.gnome.org/show_bug.cgi?id=589045
+Patch0:		planner-0.14.4-build-fix.patch
+Patch1:		planner-0.14.4-edsapi.patch
 License:	GPL
 Group:		Applications/Productivity
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -27,10 +30,13 @@ BuildRequires:	libxml2-devel >= 2.6.0
 BuildRequires:	libxslt-devel >= 1.1.23
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	libglade2-devel >= 2.4.0
-BuildRequires:	pygtk2 >= 2.6.0
+BuildRequires:	pygtk2-devel >= 2.6.0
 BuildRequires:	evolution-devel, evolution-data-server-devel
 BuildRequires:	libgsf-devel >= 1.6
 BuildRequires:	gtk-doc
+BuildRequires:	libSM-devel
+BuildRequires:	libICE-devel
+BuildRequires:	python-devel
 #BuildRequires:  libgda-devel 
 
 Packager:	inagaki
@@ -94,6 +100,8 @@ This package provides a plugin to integration planner and evolution.
 
 %prep
 %setup -q
+%patch0 -p1 -b .build-fix
+%patch1 -p1 -b .edsapi
 
 %build
 %configure --with-database=no \
@@ -199,6 +207,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
 
 %changelog
+* Sat Jun 18 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 0.14.4-2
+- rebuild for Vine Linux 6
+- add BuildRequires: libSM-devel, libICE-devel, python-devel
+- add Patch0 to fix build error
+- import Patch1 from fedora development (to follow eds api change)
+
 * Mon May 25 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.14.4-1
 - new upstream release
 - update URL