use major numbers in conflicts

[bootcd.git] / bootcd.spec

diff --git a/bootcd.spec b/bootcd.spec
index 94dff22..8c2b2cf 100644 (file)
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -6,8 +6,8 @@
 %define nodefamily %{pldistro}-%{_arch}
 
 %define name bootcd-%{nodefamily}
-%define version 4.2
-%define taglevel 17
+%define version 5.0
+%define taglevel 0
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -57,7 +57,7 @@ restarted.
 
 ### avoid having yum complain about updates, as stuff is moving around
 # plc.d/bootcd*
-Conflicts: MyPLC <= 4.3-37
+Conflicts: MyPLC <= 4.3
 
 %prep
 %setup -q
@@ -190,4 +190,4 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Sep  2 2005 Mark Huang <mlhuang@cotton.CS.Princeton.EDU> - 
 - Initial build.
 
-%define module_current_branch 3.4
+%define module_current_branch 4.2