Treat fedora core like centos/rhel for package building.

diff --git a/mkpkg b/mkpkg
index 1578042fc307ad4fd8750f560d380c4d3f06581c..9156037627ee504fd46ab92396585dedd48313b5 100755 (executable)
--- a/mkpkg
+++ b/mkpkg
@@ -110,7 +110,7 @@ fi
 # Choose configure options by osversion.
 # We use the same configure options as vendor packages when possible.
 case "$osversion" in
-    centos*|rhel*)
+    centos*|rhel*|fc*)
        if [ $osrelease -ge 40 ]; then
            # RHEL 4 and up support SELinux
            configure_opts="${configure_opts}${configure_opts+$tab}--with-selinux"

diff --git a/sudo.pp b/sudo.pp
index 981a19901459db38587bfbaf08cdfc09e87e1492..9ec9ed3f19cb0070632303d54869db6abf76217e 100644 (file)
--- a/sudo.pp
+++ b/sudo.pp
@@ -86,7 +86,7 @@ still allow people to get their work done."
        # Add distro info to release
        osrelease=`echo "$pp_rpm_distro" | sed -e 's/^[^0-9]*\([0-9]\{1,2\}\).*/\1/'`
        case "$pp_rpm_distro" in
-       centos*|rhel*)
+       centos*|rhel*|fc*)
                pp_rpm_release="$pp_rpm_release.el${osrelease%%[0-9]}"
                ;;
        sles*)
@@ -97,7 +97,7 @@ still allow people to get their work done."
        # Uncomment some Defaults in sudoers
        # Note that the order must match that of sudoers.
        case "$pp_rpm_distro" in
-       centos*|rhel*)
+       centos*|rhel*|fc*)
                chmod u+w ${pp_destdir}${sudoersdir}/sudoers
                /bin/ed - ${pp_destdir}${sudoersdir}/sudoers <<-'EOF'
                /Locale settings/+1,s/^# //
@@ -124,7 +124,7 @@ still allow people to get their work done."
 
        # For RedHat the doc dir is expected to include version and release
        case "$pp_rpm_distro" in
-       centos*|rhel*)
+       centos*|rhel*|fc*)
                rhel_docdir="${docdir}-${pp_rpm_version}-${pp_rpm_release}"
                if test "`dirname ${exampledir}`" = "${docdir}"; then
                    exampledir="${rhel_docdir}/`basename ${exampledir}`"
@@ -136,7 +136,7 @@ still allow people to get their work done."
 
        # Choose the correct PAM file by distro, must be tab indented for "<<-"
        case "$pp_rpm_distro" in
-       centos*|rhel*)
+       centos*|rhel*|fc*)
                mkdir -p ${pp_destdir}/etc/pam.d
                if test $osrelease -lt 50; then
                        cat > ${pp_destdir}/etc/pam.d/sudo <<-EOF