Fix setting of pp_rpm_version when there is no patchlevel present.

Also tighten up the regexp for pp_rpm_release.
This commit is contained in:
Todd C. Miller
2015-04-07 10:15:45 -06:00
parent f63896e7d8
commit 6d63ca32fb

View File

@@ -41,8 +41,8 @@ still allow people to get their work done."
%if [rpm,deb] %if [rpm,deb]
# Convert patch level into release and remove from version # Convert patch level into release and remove from version
pp_rpm_release="`expr \( $version : '.*p\([0-9][0-9]*\)' \| 0 \) + 1`" pp_rpm_release="`expr \( $version : '.*p\([0-9][0-9]*\)$' \| 0 \) + 1`"
pp_rpm_version="`expr $version : '\(.*\)p[0-9][0-9]*'`" pp_rpm_version="`expr \( $version : '\(.*\)p[0-9][0-9]*$' \| $version \)`"
pp_rpm_license="BSD" pp_rpm_license="BSD"
pp_rpm_url="http://www.sudo.ws/" pp_rpm_url="http://www.sudo.ws/"
pp_rpm_group="Applications/System" pp_rpm_group="Applications/System"