Author: glen Date: Tue Oct 17 19:28:14 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - package is noarch again
---- Files affected: SPECS: linux-live.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/linux-live.spec diff -u SPECS/linux-live.spec:1.17 SPECS/linux-live.spec:1.18 --- SPECS/linux-live.spec:1.17 Tue Oct 17 18:00:36 2006 +++ SPECS/linux-live.spec Tue Oct 17 21:28:09 2006 @@ -3,7 +3,7 @@ Summary(pl): Skrypty Linux Live Name: linux-live Version: 5.5.0 -Release: 1.26 +Release: 1.30 License: GPL Group: Applications/System Source0: http://www.linux-live.org/dl/%{name}-%{version}.tar.gz @@ -12,8 +12,10 @@ Patch1: %{name}-package.patch URL: http://www.linux-live.org/ Requires: squashfs +BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _libdir %{_prefix}/lib %define _libexecdir %{_libdir}/%{name} %define _sysconfdir /etc/%{name} %define __cp cp --preserve=timestamps @@ -46,7 +48,6 @@ Requires: mkisofs Requires: pci-database Requires: sed -Requires: squashfs Requires: unionfs %description build @@ -60,10 +61,6 @@ %patch0 -p1 %patch1 -p1 -%if "%{_lib}" != "lib" -%{__sed} -i -e 's,usr/lib,usr/%{_lib},' runme.sh initrd/initrd_create -%endif - rm -rf initrd/kernel-modules/2.6.16 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -91,12 +88,9 @@ install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin %{__cp} initrd/rootfs/bin/modprobe $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/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? +# FIXME: 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/initrd_create chmod -x $RPM_BUILD_ROOT%{_libdir}/liblinuxlive @@ -144,6 +138,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2006/10/17 19:28:09 glen +- package is noarch again + Revision 1.17 2006/10/17 16:00:36 glen - copy binaries at runtime not at package time ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-live.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
