git://git.onelab.eu
/
bootstrapfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec...
[bootstrapfs.git]
/
noderepo.spec
diff --git
a/noderepo.spec
b/noderepo.spec
index
e95ba88
..
f213061
100644
(file)
--- a/
noderepo.spec
+++ b/
noderepo.spec
@@
-8,11
+8,12
@@
# %{distrorelease} : e.g. 8
# %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
# %{distrorelease} : e.g. 8
# %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
-%define nodefamily %{pldistro}-%{_arch}
+%define nodefamily %{pldistro}-%{distroname}-%{_arch}
+%define obsolete_nodefamily %{pldistro}-%{_arch}
%define name noderepo-%{nodefamily}
%define name noderepo-%{nodefamily}
-%define version
1
.0
-%define taglevel
1
0
+%define version
2
.0
+%define taglevel 0
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-37,6
+38,10
@@
BuildArch: noarch
BuildRequires: rsync
Requires: myplc
BuildRequires: rsync
Requires: myplc
+# 5.0 now has 3-fold nodefamily
+%define obsolete_nodefamily %{pldistro}-%{_arch}
+Obsoletes: noderepo-%{obsolete_nodefamily}
+
%define debug_package %{nil}
%description
%define debug_package %{nil}
%description
@@
-74,6
+79,9
@@
service plc start packages
%config(noreplace) /var/www/html/install-rpms/%{nodefamily}/yumgroups.xml
%changelog
%config(noreplace) /var/www/html/install-rpms/%{nodefamily}/yumgroups.xml
%changelog
+* Mon Jan 04 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-11
+- for building on fedora12
+
* Thu Oct 22 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-10
- cosmetic change in message at build-time
* Thu Oct 22 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-10
- cosmetic change in message at build-time
@@
-111,3
+119,5
@@
service plc start packages
* Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
- Initial build.
* Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
- Initial build.
+
+%define module_current_branch 1.0