SPECS (DEVEL): umlinux.spec - removed -utils. Thes files are packeged in *w...
pawelz
pawelz at pld-linux.org
Mon Oct 27 20:16:58 CET 2008
Author: pawelz Date: Mon Oct 27 19:16:58 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- removed -utils. Thes files are packeged in *working* umlinux-tools.spec
---- Files affected:
SPECS:
umlinux.spec (1.23.2.3 -> 1.23.2.4)
---- Diffs:
================================================================
Index: SPECS/umlinux.spec
diff -u SPECS/umlinux.spec:1.23.2.3 SPECS/umlinux.spec:1.23.2.4
--- SPECS/umlinux.spec:1.23.2.3 Mon Feb 12 14:20:16 2007
+++ SPECS/umlinux.spec Mon Oct 27 20:16:53 2008
@@ -1,7 +1,6 @@
# $Revision$, $Date$
#%define kernel_version 2.6.11.1
%define kernel_version 2.6.12.1
-%define utils_version 20040406
%define uml_patch 2.6.11.8-bs6
#%define uml_patch 2.6.11.8-bs5
#%define uml_patch 2.6.11-bs4
@@ -18,12 +17,10 @@
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{kernel_version}.tar.bz2
# Source0-md5: 542d5aa1657f8da60b41d4d08b098841
Source1: %{name}-config
-Source2: http://dl.sourceforge.net/user-mode-linux/uml_utilities_%{utils_version}.tar.bz2
-# Source2-md5: 2c1ccd9efacbfb39e42d482b89b2550a
-Source3: http://user-mode-linux.sourceforge.net/UserModeLinux-HOWTO.html
-# Source3-md5: 781dc3611ebf60ac07814a1cd31c936d
-Source4: %{name}-etc-umltab
-Source5: %{name}-rc-init
+Source2: http://user-mode-linux.sourceforge.net/UserModeLinux-HOWTO.html
+# Source2-md5: 781dc3611ebf60ac07814a1cd31c936d
+Source3: %{name}-etc-umltab
+Source4: %{name}-rc-init
Patch0: http://www.user-mode-linux.org/~blaisorblade/patches/guest/uml-%{uml_patch}/uml-%{uml_patch}.patch.bz2
Patch1: ftp://ftp.linux.ee/pub/gentoo/portage/sys-apps/usermode-utilities/files/20040406-CAN-2004-1295.patch
Patch2: http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-%{skas_patch}/skas-%{skas_patch}.patch.bz2
@@ -50,28 +47,6 @@
%description modules -l pl.UTF-8
Moduły Linuksa w przestrzeni użytkownika.
-%package utils
-Summary: User Mode Linux Utilities
-Summary(pl.UTF-8): Narzędzia dla Linuksa w przestrzeni użytkownika
-Group: Applications/Emulators
-
-%description utils
-Utilities for User Mode Linux.
-
-%description utils -l pl.UTF-8
-Narzędzia dla Linuksa w przestrzeni użytkownika.
-
-%package utils-perl
-Summary: User Mode Linux Perl Utilities
-Summary(pl.UTF-8): Narzędzia perlowe dla Linuksa w przestrzeni użytkownika
-Group: Applications/Emulators
-
-%description utils-perl
-Perl Utilities for User Mode Linux.
-
-%description utils-perl -l pl.UTF-8
-Narzędzia perlowe dla Linuksa w przestrzeni użytkownika.
-
%package init
Summary: Automagic startup/shutdown User Mode Linux
Summary(pl.UTF-8): Automagiczy start/stop Linuksa w przestrzeni użytkownika
@@ -84,7 +59,7 @@
Automagiczy start/stop Linuksa w przestrzeni użytkownika.
%prep
-%setup -q -n linux-%{kernel_version} -a 2
+%setup -q -n linux-%{kernel_version}
#%patch0 -p1
cd tools
%patch1 -p1
@@ -92,35 +67,21 @@
#patch2 -p1
cp %{SOURCE1} ./.config
-cp %{SOURCE3} .
+cp %{SOURCE2} .
%build
%{__make} ARCH=um oldconfig
# $((0x... )) it's not /bin/sh compatible:
%{__make} ARCH=um SHELL=/bin/bash linux
%{__make} ARCH=um modules
-%{__make} -C tools
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},/etc/rc.d/init.d}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/umltab
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/uml
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/umltab
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/uml
%{__make} ARCH=um modules_install INSTALL_MOD_PATH=$RPM_BUILD_ROOT
-install linux $RPM_BUILD_ROOT%{_bindir}/umlinux
-install tools/moo/uml_moo $RPM_BUILD_ROOT%{_bindir}
-install tools/umlgdb/umlgdb $RPM_BUILD_ROOT%{_bindir}
-install tools/port-helper/port-helper $RPM_BUILD_ROOT%{_bindir}
-install tools/uml_net/uml_net $RPM_BUILD_ROOT%{_bindir}
-install tools/uml_router/uml_switch $RPM_BUILD_ROOT%{_bindir}
-install tools/watchdog/uml_watchdog $RPM_BUILD_ROOT%{_bindir}
-install tools/jail/jailer.pl $RPM_BUILD_ROOT%{_bindir}
-install tools/jailtest/jailtest $RPM_BUILD_ROOT%{_bindir}
-install tools/tunctl/tunctl $RPM_BUILD_ROOT%{_bindir}
-install tools/honeypot/honeypot.pl $RPM_BUILD_ROOT%{_bindir}
-# install tools/honeypot/hppfslib.pm ?
-# install tools/honeypot/hppfs.pm ?
%clean
rm -rf $RPM_BUILD_ROOT
@@ -130,24 +91,6 @@
%doc *.html
%attr(755,root,root) %{_bindir}/umlinux
-%files utils
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/jailtest
-%attr(755,root,root) %{_bindir}/port-helper
-%attr(755,root,root) %{_bindir}/tunctl
-%attr(755,root,root) %{_bindir}/umlgdb
-%attr(755,root,root) %{_bindir}/uml_moo
-%attr(755,root,root) %{_bindir}/uml_net
-%attr(755,root,root) %{_bindir}/uml_switch
-%attr(755,root,root) %{_bindir}/uml_watchdog
-
-%files utils-perl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/honeypot.pl
-%attr(755,root,root) %{_bindir}/jailer.pl
-# honeypot/hppfslib.pm ?
-# honeypot/hppfs.pm ?
-
%files modules
%defattr(644,root,root,755)
/lib/*
@@ -163,6 +106,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23.2.4 2008/10/27 19:16:53 pawelz
+- removed -utils. Thes files are packeged in *working* umlinux-tools.spec
+
Revision 1.23.2.3 2007/02/12 13:20:16 baggins
- converted to UTF-8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/umlinux.spec?r1=1.23.2.3&r2=1.23.2.4&f=u
More information about the pld-cvs-commit
mailing list