packages: systemd/systemd.spec - keep devel .so links in %{_libdir}

glen glen at pld-linux.org
Mon Nov 28 09:24:23 CET 2011


Author: glen                         Date: Mon Nov 28 08:24:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- keep devel .so links in %{_libdir}

---- Files affected:
packages/systemd:
   systemd.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.46 packages/systemd/systemd.spec:1.47
--- packages/systemd/systemd.spec:1.46	Mon Nov 28 09:13:47 2011
+++ packages/systemd/systemd.spec	Mon Nov 28 09:24:18 2011
@@ -178,8 +178,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT{%{_libdir}/lib%{name}-*.so*,/%{_lib}}
-sed -e 's|%{_libdir}|/%{_lib}|' -i $RPM_BUILD_ROOT%{_pkgconfigdir}/libsystemd-daemon.pc -i $RPM_BUILD_ROOT%{_pkgconfigdir}/libsystemd-login.pc
+for lib in libsystemd-daemon libsystemd-login; do
+	%{__mv} $RPM_BUILD_ROOT{%{_libdir}/$lib.so.*,/%{_lib}}
+	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/$lib.so.*) $RPM_BUILD_ROOT%{_libdir}/$lib.so
+done
 
 # Create SysV compatibility symlinks. systemctl/systemd are smart
 # enough to detect in which way they are called.
@@ -430,8 +432,8 @@
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/systemd
-%attr(755,root,root) /%{_lib}/libsystemd-daemon.so
-%attr(755,root,root) /%{_lib}/libsystemd-login.so
+%{_libdir}/libsystemd-daemon.so
+%{_libdir}/libsystemd-login.so
 %{_pkgconfigdir}/libsystemd-daemon.pc
 %{_pkgconfigdir}/libsystemd-login.pc
 
@@ -441,6 +443,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2011/11/28 08:24:18  glen
+- keep devel .so links in %{_libdir}
+
 Revision 1.46  2011/11/28 08:13:47  glen
 - /run dir is in filesystem pkg
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.46&r2=1.47&f=u



More information about the pld-cvs-commit mailing list