Author: glen                         Date: Tue Oct  3 09:39:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- created -build subpackage

---- Files affected:
SPECS:
   linux-live.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/linux-live.spec
diff -u SPECS/linux-live.spec:1.7 SPECS/linux-live.spec:1.8
--- SPECS/linux-live.spec:1.7   Tue Aug 29 23:07:44 2006
+++ SPECS/linux-live.spec       Tue Oct  3 11:39:09 2006
@@ -3,17 +3,25 @@
 Summary(pl):   Skrypty Linux Live
 Name:          linux-live
 Version:       5.5.0
-Release:       1
+Release:       1.3
 License:       GPL
-Group:         Applications
+Group:         Applications/System
 Source0:       http://www.linux-live.org/dl/%{name}-%{version}.tar.gz
 # Source0-md5: 6a59f1ecf30780f8b3facd5dfcb01f13
+Patch0:                %{name}-fixes.patch
+Patch1:                %{name}-config.patch
+Patch2:                %{name}-modprobe.patch
+Patch3:                %{name}-modules.patch
 URL:           http://www.linux-live.org/
+BuildRequires: busybox-initrd
+BuildRequires: e2fsprogs
+BuildRequires: eject
+BuildRequires: unionfs
 Requires:      squashfs
-BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libdir %{_prefix}/lib
+%define                _libexecdir     %{_libdir}/%{name}
 
 %description
 Linux Live is a set of shell scripts which allows you to create own
@@ -29,23 +37,60 @@
 manuala i wszystkie inne nieistotne dla nas pliki), a następnie
 ściągnąć i uruchomić te skrypty, aby stworzyć własnego Live Linuksa.
 
+%package build
+Summary:       Linux Live build scripts
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+
+%description build
+Scripts to build your livecd with Linux Live scripts.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+rm -rf initrd/kernel-modules/2.6.16
+find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# tools for livecd
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_sbindir}}
-# don't remove -m644 here
-install -m644 tools/liblinuxlive $RPM_BUILD_ROOT%{_libdir}
-install tools/{deb2mo,dir2mo,img2mo,mo2dir,tgz2mo} $RPM_BUILD_ROOT%{_bindir}
-install tools/uselivemod $RPM_BUILD_ROOT%{_sbindir}
+cp -a 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}
+
+# tools for building livecd
+install -d $RPM_BUILD_ROOT%{_libexecdir}
+cp -a cd-root $RPM_BUILD_ROOT%{_libexecdir}
+cp -a runme.sh $RPM_BUILD_ROOT%{_libexecdir}
+
+# initrd
+install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd
+cp -a initrd/{cleanup,initrd_create,linuxrc} $RPM_BUILD_ROOT%{_libexecdir}
+ln -s %{_libdir}/liblinuxlive $RPM_BUILD_ROOT%{_libexecdir}/initrd
+# copy /bin
+install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin
+cp -a /bin/initrd-busybox 
$RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin/busybox
+cp -a /sbin/blkid $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin
+cp -a %{_bindir}/eject $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin
+cp -a initrd/rootfs/bin/modprobe 
$RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin
+cp -a %{_sbindir}/unionctl $RPM_BUILD_ROOT%{_libexecdir}/initrd/rootfs/bin
+cp -a %{_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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc DOC/changelog.txt DOC/requirements.txt
 %attr(755,root,root) %{_bindir}/deb2mo
 %attr(755,root,root) %{_bindir}/dir2mo
 %attr(755,root,root) %{_bindir}/img2mo
@@ -54,12 +99,26 @@
 %attr(755,root,root) %{_sbindir}/uselivemod
 %{_libdir}/liblinuxlive
 
+%files build
+%defattr(644,root,root,755)
+%doc DOC/changelog.txt DOC/requirements.txt
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/runme.sh
+%attr(755,root,root) %{_libexecdir}/cleanup
+%attr(755,root,root) %{_libexecdir}/initrd_create
+%{_libexecdir}/linuxrc
+%{_libexecdir}/cd-root
+%{_libexecdir}/initrd
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/10/03 09:39:09  glen
+- created -build subpackage
+
 Revision 1.7  2006/08/29 21:07:44  glen
 - 5.5.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-live.spec?r1=1.7&r2=1.8&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to