Browse Source

plymouth:
- update to 0.8.8
- build with libdrm-2.4.40
- add BR: gtk2-devel, libdrm-devel
- remove utils/gdm-hooks (plymouth-log-viewer)

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

daisuke 11 years ago
parent
commit
563c8827ab
1 changed files with 16 additions and 48 deletions
  1. 16 48
      p/plymouth/plymouth-vl.spec

+ 16 - 48
p/plymouth/plymouth-vl.spec

@@ -5,8 +5,8 @@
 Summary: Graphical Boot Animation and Logger
 Summary(ja): グラフィカルブートアニメーション
 Name: plymouth
-Version: 0.8.3
-Release: 9%{?_dist_release}
+Version: 0.8.8
+Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://freedesktop.org/software/plymouth/releases
@@ -18,13 +18,8 @@ Source10: vinelogo-bw.png
 Source11: plymouth-theme-script.tar.bz2
 Source12: plymouth-theme-charge.tar.bz2
 
-Patch10: plymouth-0.8.3-fix-crash-on-retain-splash.patch
-Patch11: plymouth-0.8.3-save-original-tty-lock-settings.patch
-Patch12: plymouth-0.8.3-ply084.patch
+Patch0: fix-crash.patch
 Patch13: plymouth-0.8.3-avoid-sigpipe.patch
-Patch14: plymouth-0.8.3-terminal-OPOST.patch
-Patch15: plymouth-0.8.3-terminal-no-ISTRIP.patch
-Patch16: plymouth-0.8.3-event-loop-number.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -35,8 +30,11 @@ Requires: plymouth-system-theme
 
 Obsoletes: bootsplash <= 3.2
 Provides: bootsplash
+Obsoletes: plymouth-utils < 0.8.4
+Obsoletes: plymouth-gdm-hooks < 0.8.4
 
-BuildRequires: libdrm
+BuildRequires: libdrm-devel >= 2.4.40
+BuildRequires: gtk2-devel
 BuildRequires: kernel-headers
 
 Vendor: Project Vine
@@ -93,17 +91,6 @@ Requires: pkgconfig
 This package contains the libply and libplybootsplash libraries
 and headers needed to develop 3rd party splash plugins for Plymouth.
 
-%package utils
-Summary: Plymouth related utilities
-Summary(ja): Plymouth related ユーティリティ
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-BuildRequires: gtk2-devel
-
-%description utils
-This package contains utilities that integrate with Plymouth
-including a boot log viewing application.
-
 %package scripts
 Summary: Plymouth related scripts
 Summary(ja): Plymouth 関連スクリプト
@@ -113,19 +100,6 @@ Group: Applications/System
 This package contains scripts that help integrate Plymouth with
 the system.
 
-%package gdm-hooks
-Summary: Plymouth GDM integration
-Summary(ja): Plymouth GDM 統合
-Group: Applications/System
-Requires: gdm
-Requires: plymouth-utils
-Requires: %{name} = %{version}-%{release}
-
-%description gdm-hooks
-This package contains support files for integrating Plymouth with GDM
-Namely, it adds hooks to show boot messages at the login screen in the
-event start-up services fail.
-
 %package plugin-label
 Summary: Plymouth label plugin
 Summary(ja): Plymouth label plugin
@@ -257,13 +231,8 @@ plugin.
 
 %prep
 %setup -q
-%patch10 -p1 -b .fix-crash
-%patch11 -p1 -b .save-original-tty-lock-settings
-%patch12 -p1 -b .update-scripts-from-ply084
+%patch0 -p1 -b .fix-crash
 %patch13 -p1 -b .avoid-sigpipe
-%patch14 -p1 -b .terminal-OPOST
-%patch15 -p1 -b .terminal-no-ISTRIP
-%patch16 -p1 -b .event-loop-number
 
 # Change the default theme
 sed -i -e 's/fade-in/script/g' src/plymouthd.defaults
@@ -276,7 +245,8 @@ sed -i -e 's/fade-in/script/g' src/plymouthd.defaults
            --with-background-color=0x000000                      \
 	   --with-release-file=/etc/vine-release                 \
            --enable-gdm-transition                               \
-           --with-system-root-install
+           --with-system-root-install                            \
+	   --disable-libkms
 
 make %{?_smp_mflags}
 
@@ -389,14 +359,6 @@ fi
 %{_libexecdir}/plymouth/plymouth-generate-initrd
 %{_libexecdir}/plymouth/plymouth-populate-initrd
 
-%files utils
-%defattr(-, root, root)
-%{_bindir}/plymouth-log-viewer
-
-%files gdm-hooks
-%defattr(-, root, root)
-%{_datadir}/gdm/autostart/LoginWindow/plymouth-log-viewer.desktop
-
 %files plugin-label
 %defattr(-, root, root)
 %{_libdir}/plymouth/label.so
@@ -462,6 +424,12 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Sat Nov 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.8-1
+- update to 0.8.8
+- build with libdrm-2.4.40
+- add BR: gtk2-devel, libdrm-devel
+- remove utils/gdm-hooks (plymouth-log-viewer)
+
 * Tue Jun 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.3-9
 - add patch13 from ubuntu
   - Pass MSG_NOSIGNAL when writing to Plymouth. This stops clients from