SPECS: linux-live.spec - 6.2.4 - merged from DEVEL

patrys patrys at pld-linux.org
Tue Aug 19 22:35:10 CEST 2008 

Author: patrys                       Date: Tue Aug 19 20:35:10 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 6.2.4
- merged from DEVEL

---- Files affected:
SPECS:
   linux-live.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/linux-live.spec
diff -u SPECS/linux-live.spec:1.24 SPECS/linux-live.spec:1.25
--- SPECS/linux-live.spec:1.24	Sun Dec 16 00:23:29 2007
+++ SPECS/linux-live.spec	Tue Aug 19 22:35:05 2008
@@ -4,14 +4,14 @@
 Summary:	Linux Live scripts
 Summary(pl.UTF-8):	Skrypty Linux Live
 Name:		linux-live
-Version:	5.5.0
-Release:	1.33
+Version:	6.2.4
+Release:	2
 License:	GPL
 Group:		Applications/System
-Source0:	http://www.linux-live.org/dl/%{name}-%{version}.tar.gz
-# Source0-md5:	6a59f1ecf30780f8b3facd5dfcb01f13
-Patch0:		%{name}-fixes.patch
-Patch1:		%{name}-package.patch
+Source0:	ftp://ftp.slax.org/Linux-Live/%{name}-%{version}.tar.gz
+# Source0-md5:	1d14e9323bb98ef5621e0c7f7755cbd0
+Source1:	%{name}-build.sh
+Patch0:		%{name}-package.patch
 URL:		http://www.linux-live.org/
 Requires:	squashfs
 BuildArch:	noarch
@@ -22,6 +22,9 @@
 %define		_sysconfdir	/etc/%{name}
 %define		__cp	cp --preserve=timestamps
 
+# do not touch initrd files
+%define		_noautostrip	.*/cd-root/.*
+
 %description
 Linux Live is a set of shell scripts which allows you to create own
 LiveCD from every Linux distribution. Just install your favourite
@@ -50,7 +53,6 @@
 Requires:	mkisofs
 Requires:	pci-database
 Requires:	sed
-Requires:	unionfs
 
 %description build
 Scripts to build your livecd with Linux Live scripts.
@@ -61,7 +63,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
@@ -70,31 +71,29 @@
 rm -rf $RPM_BUILD_ROOT
 # tools for livecd
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_sbindir}}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/linux-live-build
 %{__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}
+%{__cp} -a tools/{deb2lzm,dir2lzm,lzm2dir,tgz2lzm} $RPM_BUILD_ROOT%{_bindir}
 
 # 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} install $RPM_BUILD_ROOT%{_libexecdir}
 %{__cp} -a DOC $RPM_BUILD_ROOT%{_libexecdir}
 
 # initrd
 install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd
-%{__cp} -p initrd/{cleanup,initrd_create,linuxrc} $RPM_BUILD_ROOT%{_libexecdir}/initrd
+%{__cp} -p initrd/{addlocaleslib,cleanup,initrd_create,linuxrc,upd-rootfs} $RPM_BUILD_ROOT%{_libexecdir}/initrd
+%{__cp} -a initrd/{fuse,ntfs-3g,posixovl,rootfs} $RPM_BUILD_ROOT%{_libexecdir}/initrd
 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
+ln -sf ntfs-3g $RPM_BUILD_ROOT%{_libexecdir}/initrd/ntfs-3g/usr/bin/mount.ntfs-3g
 
 # 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 -R -x+X $RPM_BUILD_ROOT%{_libexecdir}/initrd/
 chmod -x $RPM_BUILD_ROOT%{_libdir}/liblinuxlive
 
 %clean
@@ -102,37 +101,55 @@
 
 %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) %{_sbindir}/uselivemod
+%attr(755,root,root) %{_bindir}/deb2lzm
+%attr(755,root,root) %{_bindir}/dir2lzm
+%attr(755,root,root) %{_bindir}/lzm2dir
+%attr(755,root,root) %{_bindir}/tgz2lzm
 %{_libdir}/liblinuxlive
 
 %files build
 %defattr(644,root,root,755)
 %doc DOC/changelog.txt DOC/requirements.txt
+%attr(755,root,root) %{_sbindir}/linux-live-build
 %dir %{_sysconfdir}
 %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
+%attr(755,root,root) %{_libexecdir}/install
 %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/addlocaleslib
 %attr(755,root,root) %{_libexecdir}/initrd/cleanup
 %attr(755,root,root) %{_libexecdir}/initrd/initrd_create
+%attr(755,root,root) %{_libexecdir}/initrd/upd-rootfs
+%dir %{_libexecdir}/initrd/fuse
+%dir %{_libexecdir}/initrd/fuse/usr
+%dir %{_libexecdir}/initrd/fuse/usr/bin
+%attr(755,root,root) %{_libexecdir}/initrd/fuse/usr/bin/*
+%dir %{_libexecdir}/initrd/fuse/usr/lib
+%attr(755,root,root) %{_libexecdir}/initrd/fuse/usr/lib/*.so*
+%dir %{_libexecdir}/initrd/ntfs-3g
+%dir %{_libexecdir}/initrd/ntfs-3g/usr
+%dir %{_libexecdir}/initrd/ntfs-3g/usr/bin
+%attr(755,root,root) %{_libexecdir}/initrd/ntfs-3g/usr/bin/*
+%dir %{_libexecdir}/initrd/ntfs-3g/usr/lib
+%attr(755,root,root) %{_libexecdir}/initrd/ntfs-3g/usr/lib/*.so*
+%dir %{_libexecdir}/initrd/posixovl
+%dir %{_libexecdir}/initrd/posixovl/usr
+%dir %{_libexecdir}/initrd/posixovl/usr/bin
+%attr(755,root,root) %{_libexecdir}/initrd/posixovl/usr/bin/*
 %dir %{_libexecdir}/initrd/rootfs
 %dir %{_libexecdir}/initrd/rootfs/bin
-%attr(755,root,root) %{_libexecdir}/initrd/rootfs/bin/modprobe
+%attr(755,root,root) %{_libexecdir}/initrd/rootfs/bin/*
+%{_libexecdir}/initrd/rootfs/etc
+%dir %{_libexecdir}/initrd/rootfs/lib
+%attr(755,root,root) %{_libexecdir}/initrd/rootfs/lib/*.so*
+%{_libexecdir}/initrd/rootfs/usr
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -140,6 +157,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2008/08/19 20:35:05  patrys
+- 6.2.4
+- merged from DEVEL
+
+Revision 1.22.2.11  2008/08/15 20:45:08  patrys
+- fix mksquashfs
+- works
+
 Revision 1.24  2007/12/15 23:23:29  glen
 - initramfs!
 
@@ -184,32 +209,33 @@
 Revision 1.11  2006/10/03 10:11:30  glen
 - more
 
-Revision 1.10  2006/10/03 10:01:00  glen
-- avoid extra autodeps (/bin/ash)
+Revision 1.22.2.10  2008/08/15 20:05:47  patrys
+- stupid me
 
-Revision 1.9  2006/10/03 09:42:35  glen
-- include config
+Revision 1.22.2.9  2008/08/15 19:58:41  patrys
+- fix packaging
 
-Revision 1.8  2006/10/03 09:39:09  glen
-- created -build subpackage
+Revision 1.22.2.8  2008/08/15 19:54:03  patrys
+- 6.2.4
 
-Revision 1.7  2006/08/29 21:07:44  glen
-- 5.5.0
+Revision 1.22.2.7  2007-12-17 10:44:35  glen
+- add build wrapper
+- skip stripping initrd files
 
-Revision 1.6  2006/06/12 19:26:02  glen
-- 5.4.7
+Revision 1.22.2.6  2007-12-15 15:05:51  patrys
+- package more files
 
-Revision 1.5  2006/05/25 12:27:13  glen
-- 5.4.6
+Revision 1.22.2.5  2007-12-14 18:06:59  patrys
+- better packaging
 
-Revision 1.4  2006/05/23 18:51:16  qboosh
-- pl
+Revision 1.22.2.4  2007-12-14 17:55:54  patrys
+- updated
 
-Revision 1.3  2006/05/22 07:12:19  glen
-- uselivemod needs root, move to sbindir
+Revision 1.22.2.3  2007-12-14 16:27:23  patrys
+- builds
 
-Revision 1.2  2006/05/19 13:25:58  glen
-- avoid /bin/ash dep
+Revision 1.22.2.2  2007-12-13 17:05:36  glen
+- 6.1.5 tarball
 
-Revision 1.1  2006/05/19 13:22:27  glen
-- new, package just tools now
+Revision 1.22.2.1  2007-12-13 17:03:26  glen
+- 6.1.4, just tarball
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/linux-live.spec?r1=1.24&r2=1.25&f=u

More information about the pld-cvs-commit mailing list