Author: glen Date: Tue Oct 17 16:00:41 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - copy binaries at runtime not at package time
---- Files affected: SPECS: linux-live.spec (1.16 -> 1.17) ---- Diffs: ================================================================ Index: SPECS/linux-live.spec diff -u SPECS/linux-live.spec:1.16 SPECS/linux-live.spec:1.17 --- SPECS/linux-live.spec:1.16 Fri Oct 13 17:34:58 2006 +++ SPECS/linux-live.spec Tue Oct 17 18:00:36 2006 @@ -3,7 +3,7 @@ Summary(pl): Skrypty Linux Live Name: linux-live Version: 5.5.0 -Release: 1.15 +Release: 1.26 License: GPL Group: Applications/System Source0: http://www.linux-live.org/dl/%{name}-%{version}.tar.gz @@ -11,10 +11,6 @@ Patch0: %{name}-fixes.patch Patch1: %{name}-package.patch URL: http://www.linux-live.org/ -BuildRequires: busybox-initrd -BuildRequires: e2fsprogs -BuildRequires: eject -BuildRequires: unionfs Requires: squashfs BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -41,7 +37,15 @@ Summary(pl): Skrypty do tworzenia Linux Live Group: Applications/System Requires: %{name} = %{version}-%{release} +Requires: busybox +Requires: coreutils +Requires: e2fsprogs +Requires: eject +Requires: grep +Requires: mawk Requires: mkisofs +Requires: pci-database +Requires: sed Requires: squashfs Requires: unionfs @@ -57,7 +61,7 @@ %patch1 -p1 %if "%{_lib}" != "lib" -%{__sed} -i -e 's,usr/lib,usr/%{_lib},' runme.sh +%{__sed} -i -e 's,usr/lib,usr/%{_lib},' runme.sh initrd/initrd_create %endif rm -rf initrd/kernel-modules/2.6.16 @@ -85,14 +89,8 @@ ln -s %{_libdir}/liblinuxlive $RPM_BUILD_ROOT%{_libexecdir}/initrd # copy /bin install -d $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 @@ -137,7 +135,8 @@ %attr(755,root,root) %{_libexecdir}/initrd/cleanup %attr(755,root,root) %{_libexecdir}/initrd/initrd_create %dir %{_libexecdir}/initrd/rootfs -%{_libexecdir}/initrd/rootfs/bin +%dir %{_libexecdir}/initrd/rootfs/bin +%attr(755,root,root) %{_libexecdir}/initrd/rootfs/bin/modprobe %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -145,6 +144,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.17 2006/10/17 16:00:36 glen +- copy binaries at runtime not at package time + Revision 1.16 2006/10/13 15:34:58 glen - single patch for easier maintenance - deps for -build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-live.spec?r1=1.16&r2=1.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
