[packages/plymouth] - move all devel libs to libdir - cut down on macro usage - rel 7
baggins
baggins at pld-linux.org
Thu Jan 2 21:23:18 CET 2014
commit 61d42f3e2680444d97638ff329bcd3841738ee84
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jan 2 21:22:55 2014 +0100
- move all devel libs to libdir
- cut down on macro usage
- rel 7
plymouth.spec | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/plymouth.spec b/plymouth.spec
index 5163948..aa63fa0 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -14,7 +14,7 @@ Summary: Graphical Boot Animation and Logger
Summary(pl.UTF-8): Graficzna animacja i logowanie startu systemu
Name: plymouth
Version: 0.8.8
-Release: 6
+Release: 7
License: GPL v2+
Group: Base
Source0: http://www.freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -50,10 +50,6 @@ Obsoletes: plymouth-utils
Obsoletes: systemd-plymouth
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define plymouthdaemon_execdir /sbin
-%define plymouthclient_execdir /bin
-%define plymouth_libdir /%{_lib}
-
%description
Plymouth provides an attractive graphical boot animation in place of
the text messages that normally get shown. Text messages are instead
@@ -378,11 +374,15 @@ sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{systemdtmpfilesdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{systemdtmpfilesdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libply.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libply.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libply-splash-core.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libply-splash-core.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libply{,-splash-core}.so
+
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
> $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth/boot-duration
@@ -401,7 +401,7 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/plymouth/plymouth-update-initrd
# FC: Add compat script for upgrades
install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sbindir}
-%{__rm} $RPM_BUILD_ROOT{%{plymouth_libdir},%{_libdir}}/*.la \
+%{__rm} $RPM_BUILD_ROOT{/%{_lib},%{_libdir}}/*.la \
$RPM_BUILD_ROOT%{_libdir}/plymouth/*.la \
$RPM_BUILD_ROOT%{_libdir}/plymouth/renderers/*.la
@@ -452,8 +452,8 @@ fi
%dir %{_sysconfdir}/plymouth
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plymouth/plymouthd.conf
%{_mandir}/man8/plymouth.8*
-%attr(755,root,root) %{plymouthdaemon_execdir}/plymouthd
-%attr(755,root,root) %{plymouthclient_execdir}/plymouth
+%attr(755,root,root) /bin/plymouth
+%attr(755,root,root) /sbin/plymouthd
%attr(755,root,root) %{_libdir}/plymouth/details.so
%attr(755,root,root) %{_libdir}/plymouth/text.so
%attr(755,root,root) %{_libdir}/plymouth/renderers/drm.so
@@ -497,10 +497,10 @@ fi
%files core-libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{plymouth_libdir}/libply.so.*.*.*
-%attr(755,root,root) %ghost %{plymouth_libdir}/libply.so.2
-%attr(755,root,root) %{plymouth_libdir}/libply-splash-core.so.*.*.*
-%attr(755,root,root) %ghost %{plymouth_libdir}/libply-splash-core.so.2
+%attr(755,root,root) /%{_lib}/libply.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libply.so.2
+%attr(755,root,root) /%{_lib}/libply-splash-core.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libply-splash-core.so.2
%attr(755,root,root) %{_libdir}/libply-boot-client.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libply-boot-client.so.2
%dir %{_libdir}/plymouth
@@ -514,9 +514,9 @@ fi
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{plymouth_libdir}/libply.so
-%attr(755,root,root) %{plymouth_libdir}/libply-splash-core.so
+%attr(755,root,root) %{_libdir}/libply.so
%attr(755,root,root) %{_libdir}/libply-boot-client.so
+%attr(755,root,root) %{_libdir}/libply-splash-core.so
%attr(755,root,root) %{_libdir}/libply-splash-graphics.so
%{_includedir}/plymouth-1
%{_pkgconfigdir}/ply-boot-client.pc
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/plymouth.git/commitdiff/61d42f3e2680444d97638ff329bcd3841738ee84
More information about the pld-cvs-commit
mailing list