On Tue, Jul 03, 2007 at 11:47:18AM -0500, Tom spot Callaway wrote: > This is why Fedora adopted the pre-release versioning scheme that we > did: > > http://fedoraproject.org/wiki/Packaging/NamingGuidelines#PreReleasePackages > > In the Fedora scheme, this would be > > 0.%{X}.%{alphatag} > > Or, in your specific example: > > kernel-2.6.22-0.2.rc7.git1.fc8 vs kernel-2.6.22-0.1.rc7.fc8 Ok, that looks fixable by doing this.. Jarod, want to give this a quick once-over? Index: kernel-2.6.spec =================================================================== RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.3257 diff -u -p -r1.3257 kernel-2.6.spec --- kernel-2.6.spec 3 Jul 2007 16:45:36 -0000 1.3257 +++ kernel-2.6.spec 3 Jul 2007 18:45:22 -0000 @@ -15,7 +15,7 @@ Summary: The Linux kernel (the core of t # fedora_build defines which build revision of this kernel version we're building. In the # non-kernel world, this is analogous to the Release: field, and is formatted similarly. -%define fedora_build 2%{?dist} +%define fedora_build 2 # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base, @@ -107,7 +107,7 @@ Summary: The Linux kernel (the core of t # pkg_release is what we'll fill in for the rpm Release: field %if %{released_kernel} -%define pkg_release %{fedora_build}%{?buildid} +%define pkg_release %{fedora_build}%{?dist}%{?buildid} %else %if 0%{?rcrev} %define rctag .rc%rcrev @@ -118,7 +118,7 @@ Summary: The Linux kernel (the core of t %define rctag .rc0 %endif %endif -%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid} +%define pkg_release 0.%{fedora_build}%{?buildid}%{?rctag}%{?gittag}%{?dist} %endif # The kernel tarball/base version > Note that for this to work, you need to increment %{X} upon every new > package. It's non-obvious to me what %{?buildid} is, but it seems to auto-increment. Dave -- http://www.codemonkey.org.uk _______________________________________________ Fedora-kernel-list mailing list Fedora-kernel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-kernel-list
