Browse Source

tuxonice-userui: remove fbsplash add usplash, addBR: usplash-devel, glib-static

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4021 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
b0dfc0ead8
1 changed files with 24 additions and 12 deletions
  1. 24 12
      t/tuxonice-userui/tuxonice-userui-vl.spec

+ 24 - 12
t/tuxonice-userui/tuxonice-userui-vl.spec

@@ -2,7 +2,7 @@ Summary: UserUI tools for TuxOnIce
 Summary(ja): TuxOnIce 用の UserUI ツール
 Name: tuxonice-userui
 Version: 1.0
-Release: 3%{?_dist_release}
+Release: 6%{?_dist_release}
 License: GPL
 Group: Applications/System
 URL: http://tuxonice.net/
@@ -10,12 +10,14 @@ URL: http://tuxonice.net/
 Source0: http://tuxonice.net/downloads/all/tuxonice-userui-%{version}.tar.gz
 Source1: TOI-Vine.tar.bz2
 Patch10: suspend2-userui-0.6.4-no-chown.patch
-Patch11: suspend2-userui-0.7.2-disable-usplash.patch
+Patch11: tuxonice-userui-1.0-disable-fbsplash.patch
 Patch12: suspend2-userui-0.7.2-change-optimize-level.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libpng-static, libjpeg-static, freetype2-static
+BuildRequires: glibc-static
+BuildRequires: libpng-static, freetype2-static
 BuildRequires: zlib-static, libmng-static, lcms-static
+BuildRequires: usplash-devel
 Obsoletes: suspend2-userui < 0.7.3
 
 %description
@@ -33,20 +35,22 @@ Suspend 2 用のユーザーインターフェースである Suspend2-UserUI 
 Suspend2-UserUI は Suspend 2 のオプショナルなコンポーネントですが、インスト
 ールすればサスペンドがより楽しいものになります。
 
-%package fbsplash
+%package usplash
 Summary: TuxOnIce UserUI tool for framebuffer console.
 Summary(ja): フレームバッファ用 TuxOnIce UserUI ツール
 Group: Applications/System
 Requires: tuxonice-userui
+Requires: usplash
 Obsoletes: suspend2-userui-fbsplash < 0.7.3
+Obsoletes: tunonice-userui-fbsplash < 1.0-5
 
-%description fbsplash
+%description usplash
 This package includes the UserUI tool to display progress bar on the
-framebuffer console. (using fbsplash feature)
+framebuffer console. (using usplash feature)
 
-%description fbsplash -l ja
+%description usplash -l ja
 このパッケージはフレームバッファコンソール上にプログレスバーを表示する
-ための UserUI ツールを含んでいます。(fpsplash の機能を使用)
+ための UserUI ツールを含んでいます。(usplash の機能を使用)
 
 
 %prep
@@ -70,7 +74,7 @@ INSTDIR=$RPM_BUILD_ROOT/sbin make -e install
 # creating symlinks - see the NOTE in the below changelog
 pushd $RPM_BUILD_ROOT/sbin
 ln -s tuxoniceui_text     suspend2ui_text
-ln -s tuxoniceui_fbsplash suspend2ui_fbsplash
+ln -s tuxoniceui_usplash suspend2ui_usplash
 popd
 
 # Install Vine themes
@@ -94,15 +98,23 @@ popd
 /sbin/suspend2ui_text
 
 
-%files fbsplash
-/sbin/tuxoniceui_fbsplash
-/sbin/suspend2ui_fbsplash
+%files usplash
+/sbin/tuxoniceui_usplash
+/sbin/suspend2ui_usplash
 %config %{_sysconfdir}/splash/tuxonice
 %config %{_sysconfdir}/splash/suspend2
 %{_sysconfdir}/splash/TOI-Vine
 
 
 %changelog
+* Sat May 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0-6
+- add BR: glibc-static
+
+* Sat Apr 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0-5
+- update patch11 to disable fbsplash and enable usplash
+- add BR:usplash-devel
+- add -usplash subpackage, remove -fbsplash
+
 * Sat Apr 11 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.0-3
 - rebuild with lcms 1.18vl2