SPECS: linux-live.spec - use install instead of cp to copy files with diffe...

shadzik shadzik at pld-linux.org
Thu Oct 16 22:09:46 CEST 2008


Author: shadzik                      Date: Thu Oct 16 20:09:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use install instead of cp to copy files with different mode

---- Files affected:
SPECS:
   linux-live.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/linux-live.spec
diff -u SPECS/linux-live.spec:1.27 SPECS/linux-live.spec:1.28
--- SPECS/linux-live.spec:1.27	Tue Sep  9 13:23:03 2008
+++ SPECS/linux-live.spec	Thu Oct 16 22:09:41 2008
@@ -88,16 +88,11 @@
 
 # initrd
 install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd
-%{__cp} -p initrd/{addlocaleslib,cleanup,initrd_create,linuxrc,upd-rootfs} $RPM_BUILD_ROOT%{_libexecdir}/initrd
+install -p -m 644 initrd/{addlocaleslib,cleanup,initrd_create,linuxrc,upd-rootfs} $RPM_BUILD_ROOT%{_libexecdir}/initrd
 %{__cp} -a initrd/{fuse,ntfs-3g,posixovl,rootfs} $RPM_BUILD_ROOT%{_libexecdir}/initrd
 ln -s %{_libdir}/liblinuxlive $RPM_BUILD_ROOT%{_libexecdir}/initrd
 ln -sf ntfs-3g $RPM_BUILD_ROOT%{_libexecdir}/initrd/ntfs-3g/usr/bin/mount.ntfs-3g
 
-# avoid autodeps
-# FIXME: how to copy file without preserving +x bit?
-chmod -R -x+X $RPM_BUILD_ROOT%{_libexecdir}/initrd/
-chmod -x $RPM_BUILD_ROOT%{_libdir}/liblinuxlive
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -159,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2008/10/16 20:09:41  shadzik
+- use install instead of cp to copy files with different mode
+
 Revision 1.27  2008/09/09 11:23:03  patrys
 - use same list for noautostrip
 - rel 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/linux-live.spec?r1=1.27&r2=1.28&f=u



More information about the pld-cvs-commit mailing list