git://git.onelab.eu
/
sliceimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Requires to the correct package.
[sliceimage.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
97f73d7
..
a4258ff
100644
(file)
--- a/
vserver-reference.spec
+++ b/
vserver-reference.spec
@@
-1,11
+1,11
@@
%define name vserver
%define name vserver
-%define version 4.
1
-%define release
3
%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.
2
+%define release
0
%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab 4.0
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab 4.0
-URL: http
://cvs.planet-lab.org/cvs/vserver-reference
+URL: http
s://svn.planet-lab.org/svn/VserverReference/
Summary: VServer reference image
Name: %{name}
Summary: VServer reference image
Name: %{name}
@@
-15,8
+15,6
@@
Source0: %{name}-%{version}.tar.bz2
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum
-Requires(pre): coreutils
%define debug_package %{nil}
%define debug_package %{nil}
@@
-27,6
+25,8
@@
This package does not really exist.
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
+Requires: util-vserver, e2fsprogs, yum
+Requires(pre): /bin/sh, coreutils
%description reference
This package creates the virtual server (VServer) reference image used
%description reference
This package creates the virtual server (VServer) reference image used
@@
-35,20
+35,19
@@
as the installation base for new PlanetLab slivers.
%package system-packages
Summary: System slice packages
Group: Applications/System
%package system-packages
Summary: System slice packages
Group: Applications/System
-Requires: vserver-reference = %{version}-%{release}
+Requires: vserver-reference
>
= %{version}-%{release}
AutoReqProv: no
%description system-packages
This package installs the RPMS necessary to create system ("root
AutoReqProv: no
%description system-packages
This package installs the RPMS necessary to create system ("root
-
resource") slices from the virtual server (VServer) reference image.
+resource") slices from the virtual server (VServer) reference image.
%prep
%setup -q
%build
pushd VserverReference
%prep
%setup -q
%build
pushd VserverReference
-./build.sh
-./system-packages.sh
+./build.sh %{pldistro}
popd
%install
popd
%install
@@
-84,7
+83,7
@@
fi
%files system-packages
%defattr(-,root,root)
%files system-packages
%defattr(-,root,root)
-/vservers/
system-packages
+/vservers/
.vstub
%define vcached_pid /var/run/vcached.pid
%define vcached_pid /var/run/vcached.pid