- don't give error about missing default.so

- rework packaging of boot-duration to prevent .rpmnew droppings (bug
    469752)
This commit is contained in:
Ray Strode 2008-11-17 20:37:10 +00:00
parent f7efa98d55
commit 8c29b35369
2 changed files with 14 additions and 4 deletions

View File

@ -5,7 +5,7 @@
Summary: Plymouth Graphical Boot Animation and Logger Summary: Plymouth Graphical Boot Animation and Logger
Name: plymouth Name: plymouth
Version: 0.6.0 Version: 0.6.0
Release: 0.2008.11.17.2%{?dist} Release: 0.2008.11.17.3%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@ -175,11 +175,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
(cd $RPM_BUILD_ROOT%{_bindir}; ln -s ../../bin/plymouth) (cd $RPM_BUILD_ROOT%{_bindir}; ln -s ../../bin/plymouth)
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post
[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
%postun %postun
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
rm -f %{_libdir}/plymouth/default.so rm -f %{_libdir}/plymouth/default.so
@ -231,16 +235,17 @@ fi
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
%dir %{_datadir}/plymouth %dir %{_datadir}/plymouth
%dir %{_libexecdir}/plymouth %dir %{_libexecdir}/plymouth
%dir %{_localstatedir}/lib/plymouth
%{plymouthdaemon_execdir}/plymouthd %{plymouthdaemon_execdir}/plymouthd
%{plymouthclient_execdir}/plymouth %{plymouthclient_execdir}/plymouth
%{_bindir}/plymouth %{_bindir}/plymouth
%{_bindir}/rhgb-client %{_bindir}/rhgb-client
%{_libdir}/plymouth/details.so %{_libdir}/plymouth/details.so
%{_libdir}/plymouth/text.so %{_libdir}/plymouth/text.so
%{_datadir}/plymouth/default-boot-duration
%{_localstatedir}/run/plymouth %{_localstatedir}/run/plymouth
%{_localstatedir}/spool/plymouth %{_localstatedir}/spool/plymouth
%{_localstatedir}/lib/plymouth %ghost %{_localstatedir}/lib/plymouth/boot-duration
%config(noreplace) %{_localstatedir}/lib/plymouth/boot-duration
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
@ -306,6 +311,11 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%changelog %changelog
* Mon Nov 17 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.11.17.3
- don't give error about missing default.so
- rework packaging of boot-duration to prevent .rpmnew droppings
(bug 469752)
* Mon Nov 17 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.11.17.2 * Mon Nov 17 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.11.17.2
- Don't tell gdm to transition unless booting into runlevel 3 - Don't tell gdm to transition unless booting into runlevel 3
(bug 471785) (bug 471785)

View File

@ -1 +1 @@
fd181acf8e02ac4825c004af30f6acad plymouth-0.6.0.tar.bz2 a727be1d894414edd2d31449161a0f2b plymouth-0.6.0.tar.bz2