Author: glen Date: Fri Oct 13 12:53:27 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - lib64 fix, executable bits for .sh scripts - include DOC dir for iso
---- Files affected: SPECS: linux-live.spec (1.14 -> 1.15) ---- Diffs: ================================================================ Index: SPECS/linux-live.spec diff -u SPECS/linux-live.spec:1.14 SPECS/linux-live.spec:1.15 --- SPECS/linux-live.spec:1.14 Sat Oct 7 15:04:52 2006 +++ SPECS/linux-live.spec Fri Oct 13 14:53:21 2006 @@ -3,7 +3,7 @@ Summary(pl): Skrypty Linux Live Name: linux-live Version: 5.5.0 -Release: 1.8 +Release: 1.13 License: GPL Group: Applications/System Source0: http://www.linux-live.org/dl/%{name}-%{version}.tar.gz @@ -20,7 +20,6 @@ Requires: squashfs 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 @@ -58,6 +57,10 @@ %patch2 -p1 %patch3 -p1 +%if "%{_lib}" != "lib" +%{__sed} -i -e 's,usr/lib,usr/%{_lib},' runme.sh +%endif + rm -rf initrd/kernel-modules/2.6.16 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -75,6 +78,7 @@ install -d $RPM_BUILD_ROOT%{_libexecdir} %{__cp} -a cd-root $RPM_BUILD_ROOT%{_libexecdir} %{__cp} runme.sh $RPM_BUILD_ROOT%{_libexecdir} +%{__cp} -a DOC $RPM_BUILD_ROOT%{_libexecdir} # initrd install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd @@ -119,8 +123,16 @@ %dir %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config %dir %{_libexecdir} +%{_libexecdir}/DOC %attr(755,root,root) %{_libexecdir}/runme.sh -%{_libexecdir}/cd-root +%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 %dir %{_libexecdir}/initrd %{_libexecdir}/initrd/linuxrc %attr(755,root,root) %{_libexecdir}/initrd/cleanup @@ -134,6 +146,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.15 2006/10/13 12:53:21 glen +- lib64 fix, executable bits for .sh scripts +- include DOC dir for iso + Revision 1.14 2006/10/07 13:04:52 qboosh - pl for -build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/linux-live.spec?r1=1.14&r2=1.15&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
