Author: patrys Date: Fri Dec 14 16:27:28 2007 GMT Module: SPECS Tag: DEVEL ---- Log message: - builds
---- Files affected: SPECS: linux-live.spec (1.22.2.2 -> 1.22.2.3) ---- Diffs: ================================================================ Index: SPECS/linux-live.spec diff -u SPECS/linux-live.spec:1.22.2.2 SPECS/linux-live.spec:1.22.2.3 --- SPECS/linux-live.spec:1.22.2.2 Thu Dec 13 18:05:36 2007 +++ SPECS/linux-live.spec Fri Dec 14 17:27:23 2007 @@ -8,8 +8,7 @@ Group: Applications/System Source0: ftp://ftp.slax.org/Linux-Live/%{name}-%{version}.tar.gz # Source0-md5: 9d3639408907a7b98012e0bdcff9c0d1 -Patch0: %{name}-fixes.patch -Patch1: %{name}-package.patch +Patch0: %{name}-package.patch URL: http://www.linux-live.org/ Requires: squashfs BuildArch: noarch @@ -59,7 +58,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 rm -rf initrd/kernel-modules/2.6.16 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -69,15 +67,15 @@ # tools for livecd install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_sbindir}} %{__cp} -p tools/liblinuxlive $RPM_BUILD_ROOT%{_libdir} -%{__cp} -a tools/{deb2mo,dir2mo,img2mo,mo2dir,tgz2mo} $RPM_BUILD_ROOT%{_bindir} +%{__cp} -a tools/{deb2lzm,dir2lzm,lzm2dir,tgz2lzm} $RPM_BUILD_ROOT%{_bindir} %{__cp} -a tools/uselivemod $RPM_BUILD_ROOT%{_sbindir} # tools for building livecd install -d $RPM_BUILD_ROOT%{_sysconfdir} -%{__cp} config $RPM_BUILD_ROOT%{_sysconfdir} +%{__cp} .config $RPM_BUILD_ROOT%{_sysconfdir}/config install -d $RPM_BUILD_ROOT%{_libexecdir} %{__cp} -a cd-root $RPM_BUILD_ROOT%{_libexecdir} -%{__cp} runme.sh $RPM_BUILD_ROOT%{_libexecdir} +%{__cp} build $RPM_BUILD_ROOT%{_libexecdir} %{__cp} -a DOC $RPM_BUILD_ROOT%{_libexecdir} # initrd @@ -86,12 +84,10 @@ ln -s %{_libdir}/liblinuxlive $RPM_BUILD_ROOT%{_libexecdir}/initrd # copy /bin 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 # avoid autodeps # 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 @@ -100,11 +96,10 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/deb2mo -%attr(755,root,root) %{_bindir}/dir2mo -%attr(755,root,root) %{_bindir}/img2mo -%attr(755,root,root) %{_bindir}/mo2dir -%attr(755,root,root) %{_bindir}/tgz2mo +%attr(755,root,root) %{_bindir}/deb2lzm +%attr(755,root,root) %{_bindir}/dir2lzm +%attr(755,root,root) %{_bindir}/lzm2dir +%attr(755,root,root) %{_bindir}/tgz2lzm %attr(755,root,root) %{_sbindir}/uselivemod %{_libdir}/liblinuxlive @@ -115,22 +110,17 @@ %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config %dir %{_libexecdir} %{_libexecdir}/DOC -%attr(755,root,root) %{_libexecdir}/runme.sh +%attr(755,root,root) %{_libexecdir}/build %dir %{_libexecdir}/cd-root %{_libexecdir}/cd-root/boot -%{_libexecdir}/cd-root/tools -%{_libexecdir}/cd-root/filelist.txt -%{_libexecdir}/cd-root/isolinux.cfg -%{_libexecdir}/cd-root/livecd.sgn -%{_libexecdir}/cd-root/*.bat -%attr(755,root,root) %{_libexecdir}/cd-root/*.sh +%{_libexecdir}/cd-root/linux %dir %{_libexecdir}/initrd +%{_libexecdir}/initrd/liblinuxlive %{_libexecdir}/initrd/linuxrc %attr(755,root,root) %{_libexecdir}/initrd/cleanup %attr(755,root,root) %{_libexecdir}/initrd/initrd_create %dir %{_libexecdir}/initrd/rootfs %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 @@ -138,6 +128,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22.2.3 2007-12-14 16:27:23 patrys +- builds + Revision 1.22.2.2 2007-12-13 17:05:36 glen - 6.1.5 tarball ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/linux-live.spec?r1=1.22.2.2&r2=1.22.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
