Author: glen Date: Tue Oct 3 10:01:06 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - avoid extra autodeps (/bin/ash)
---- Files affected: SPECS: linux-live.spec (1.9 -> 1.10) ---- Diffs: ================================================================ Index: SPECS/linux-live.spec diff -u SPECS/linux-live.spec:1.9 SPECS/linux-live.spec:1.10 --- SPECS/linux-live.spec:1.9 Tue Oct 3 11:42:35 2006 +++ SPECS/linux-live.spec Tue Oct 3 12:01:00 2006 @@ -3,7 +3,7 @@ Summary(pl): Skrypty Linux Live Name: linux-live Version: 5.5.0 -Release: 1.4 +Release: 1.5 License: GPL Group: Applications/System Source0: http://www.linux-live.org/dl/%{name}-%{version}.tar.gz @@ -23,6 +23,7 @@ %define _libdir %{_prefix}/lib %define _libexecdir %{_libdir}/%{name} %define _sysconfdir /etc/%{name} +%define __cp cp --preserve=timestamps %description Linux Live is a set of shell scripts which allows you to create own @@ -60,35 +61,40 @@ rm -rf $RPM_BUILD_ROOT # tools for livecd install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_sbindir}} -cp -a tools/liblinuxlive $RPM_BUILD_ROOT%{_libdir} -cp -a tools/{deb2mo,dir2mo,img2mo,mo2dir,tgz2mo} $RPM_BUILD_ROOT%{_bindir} -cp -a tools/uselivemod $RPM_BUILD_ROOT%{_sbindir} +%{__cp} -p tools/liblinuxlive $RPM_BUILD_ROOT%{_libdir} +%{__cp} -a tools/{deb2mo,dir2mo,img2mo,mo2dir,tgz2mo} $RPM_BUILD_ROOT%{_bindir} +%{__cp} -a tools/uselivemod $RPM_BUILD_ROOT%{_sbindir} # tools for building livecd install -d $RPM_BUILD_ROOT%{_sysconfdir} -cp -a config $RPM_BUILD_ROOT%{_sysconfdir} +%{__cp} config $RPM_BUILD_ROOT%{_sysconfdir} install -d $RPM_BUILD_ROOT%{_libexecdir} -cp -a cd-root $RPM_BUILD_ROOT%{_libexecdir} -cp -a runme.sh $RPM_BUILD_ROOT%{_libexecdir} +%{__cp} -a cd-root $RPM_BUILD_ROOT%{_libexecdir} +%{__cp} runme.sh $RPM_BUILD_ROOT%{_libexecdir} # initrd install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd -cp -a initrd/{cleanup,initrd_create,linuxrc} $RPM_BUILD_ROOT%{_libexecdir} +%{__cp} -p initrd/{cleanup,initrd_create,linuxrc} $RPM_BUILD_ROOT%{_libexecdir} ln -s %{_libdir}/liblinuxlive $RPM_BUILD_ROOT%{_libexecdir}/initrd # copy /bin install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin -cp -a /bin/initrd-busybox $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin/busybox -cp -a /sbin/blkid $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin -cp -a %{_bindir}/eject $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin -cp -a initrd/rootfs/bin/modprobe $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin -cp -a %{_sbindir}/unionctl $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin -cp -a %{_sbindir}/uniondbg $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin +%{__cp} /bin/initrd-busybox $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin/busybox +%{__cp} /sbin/blkid $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin +%{__cp} %{_bindir}/eject $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin +%{__cp} initrd/rootfs/bin/modprobe $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin +%{__cp} %{_sbindir}/unionctl $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin +%{__cp} %{_sbindir}/uniondbg $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/lib # /%{_lib} %if "%{_lib}" != "lib" ln -s lib $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/%{_lib} %endif +# avoid autodeps +# how to copy file without preserving +x bit? +chmod -x $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin/modprobe +chmod -x $RPM_BUILD_ROOT%{_libexecdir}/initrd_create + %clean rm -rf $RPM_BUILD_ROOT @@ -121,6 +127,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2006/10/03 10:01:00 glen +- avoid extra autodeps (/bin/ash) + Revision 1.9 2006/10/03 09:42:35 glen - include config ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-live.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
