new file mode 100644

@@ -0,0 +1,6 @@

+diff --git a/requirements/base.txt b/requirements/base.txt

+index 96037ccf14..712dcca023 100644

+--- a/requirements/base.txt

+@@ -7 +6,0 @@ distro>=1.0.1

+-contextvars

deleted file mode 100644

@@ -1,154 +0,0 @@

-#!/bin/sh

-#

-# Salt API

-###################################

-

-# LSB header

-

-### BEGIN INIT INFO

-# Provides:          salt-api

-# Required-Start:    $local_fs $remote_fs $network $named $time

-# Should-Start:		 $time ypbind smtp

-# Required-Stop:	 $local_fs $remote_fs $network $named $time

-# Should-Stop:		 ypbind smtp

-# Default-Start:     3 5

-# Default-Stop:      0 1 2 6

-# Short-Description: Salt API control daemon

-# Description:       This is a daemon that controls the Salt API.

-### END INIT INFO

-

-

-# chkconfig header

-

-# chkconfig: 345 99 99

-# description:  This is a daemon that controls the Salt API.

-#

-# processname: /usr/bin/salt-api

-

-

-if [ -f /etc/default/salt ]; then

-    . /etc/default/salt

-else

-    SALTAPI=/usr/bin/salt-api

-    PYTHON=/usr/bin/python

-fi

-

-# Sanity checks.

-[ -x $SALTAPI ] || exit 0

-

-DEBIAN_VERSION=/etc/debian_version

-SUSE_RELEASE=/etc/SuSE-release

-# Source function library.

-if [ -f $DEBIAN_VERSION ]; then

-   break

-elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then

-    . /etc/rc.status

-else

-    . /etc/rc.d/init.d/functions

-fi

-

-SERVICE=salt-api

-PROCESS=salt-api

-CONFIG_ARGS="-d"

-PID_FILE="/var/run/salt-api.pid"

-

-RETVAL=0

-

-start() {

-    echo -n $"Starting salt-api daemon: "

-    if [ -f $SUSE_RELEASE ]; then

-        startproc -f -p /var/run/$SERVICE.pid $SALTAPI $CONFIG_ARGS

-        rc_status -v

-    elif [ -e $DEBIAN_VERSION ]; then

-        if [ -f $LOCKFILE ]; then

-            echo -n "already started, lock file found"

-            RETVAL=1

-        elif $PYTHON $SALTAPI; then

-            echo -n "OK"

-            RETVAL=0

-        fi

-    else

-        if status $PROCESS &> /dev/null; then

-            failure "Already running."

-            RETVAL=1

-        else

-            daemon --pidfile=$PID_FILE --check $SERVICE $SALTAPI $CONFIG_ARGS

-            RETVAL=$?

-            [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE

-            echo

-            return $RETVAL

-        fi

-    fi

-    RETVAL=$?

-    echo

-    return $RETVAL

-}

-

-stop() {

-    echo -n $"Stopping salt-api daemon: "

-    if [ -f $SUSE_RELEASE ]; then

-        killproc -TERM $SALTAPI

-        rc_status -v

-    elif [ -f $DEBIAN_VERSION ]; then

-        # Added this since Debian's start-stop-daemon doesn't support spawned processes

-        if ps -ef | grep "$PYTHON $SALTAPI" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then

-            echo -n "OK"

-            RETVAL=0

-        else

-            echo -n "Daemon is not started"

-            RETVAL=1

-        fi

-    else

-        killproc $PROCESS

-        RETVAL=$?

-        echo

-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE

-        return $RETVAL

-    fi

-    RETVAL=$?

-    echo

-    return $RETVAL

-}

-

-restart() {

-   stop

-   start

-}

-

-# See how we were called.

-case "$1" in

-    start|stop|restart)

-        $1

-        ;;

-    status)

-        if [ -f $SUSE_RELEASE ]; then

-            echo -n "Checking for service salt-api "

-            checkproc $SALTAPI

-            rc_status -v

-            RETVAL=$?

-        elif [ -f $DEBIAN_VERSION ]; then

-            if [ -f $LOCKFILE ]; then

-                RETVAL=0

-                echo "salt-api is running."

-            else

-                RETVAL=1

-                echo "salt-api is stopped."

-            fi

-        else

-            status $PROCESS

-            RETVAL=$?

-        fi

-        ;;

-    condrestart|try-restart)

-        [ -f $LOCKFILE ] && restart || :

-        ;;

-    reload)

-        echo "can't reload configuration, you have to restart it"

-        RETVAL=1

-        ;;

-    *)

-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"

-        exit 1

-        ;;

-esac

-exit $RETVAL

deleted file mode 100644

@@ -1,142 +0,0 @@

-#!/bin/sh

-#

-# Salt master

-###################################

-

-# LSB header

-

-### BEGIN INIT INFO

-# Provides:          salt-master

-# Required-Start:    $all

-# Required-Stop:

-# Default-Start:     2 3 4 5

-# Default-Stop:      0 1 6

-# Short-Description: Salt master control daemon

-# Description:       This is a daemon that controls the Salt minions.

-### END INIT INFO

-

-

-# chkconfig header

-

-# chkconfig: 345 96 05

-# description:  This is a daemon that controls the Salt minions

-#

-# processname: /usr/bin/salt-master

-

-

-DEBIAN_VERSION=/etc/debian_version

-SUSE_RELEASE=/etc/SuSE-release

-# Source function library.

-if [ -f $DEBIAN_VERSION ]; then

-   break

-elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then

-    . /etc/rc.status

-else

-    . /etc/rc.d/init.d/functions

-fi

-

-# Default values (can be overridden below)

-SALTMASTER=/usr/bin/salt-master

-PYTHON=/usr/bin/python

-MASTER_ARGS=""

-

-if [ -f /etc/default/salt ]; then

-    . /etc/default/salt

-fi

-

-SERVICE=salt-master

-PROCESS=salt-master

-

-RETVAL=0

-

-start() {

-    echo -n $"Starting salt-master daemon: "

-    if [ -f $SUSE_RELEASE ]; then

-        startproc -f -p /var/run/$SERVICE.pid $SALTMASTER -d $MASTER_ARGS

-        rc_status -v

-    elif [ -e $DEBIAN_VERSION ]; then

-        if [ -f $LOCKFILE ]; then

-            echo -n "already started, lock file found"

-            RETVAL=1

-        elif $PYTHON $SALTMASTER -d $MASTER_ARGS >& /dev/null; then

-            echo -n "OK"

-            RETVAL=0

-        fi

-    else

-        daemon --check $SERVICE $SALTMASTER -d $MASTER_ARGS

-        RETVAL=$?

-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE

-        echo

-        return $RETVAL

-    fi

-    RETVAL=$?

-    echo

-    return $RETVAL

-}

-

-stop() {

-    echo -n $"Stopping salt-master daemon: "

-    if [ -f $SUSE_RELEASE ]; then

-        killproc -TERM $SALTMASTER

-        rc_status -v

-    elif [ -f $DEBIAN_VERSION ]; then

-        # Added this since Debian's start-stop-daemon doesn't support spawned processes

-        if ps -ef | grep "$PYTHON $SALTMASTER" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then

-            echo -n "OK"

-            RETVAL=0

-        else

-            echo -n "Daemon is not started"

-            RETVAL=1

-        fi

-    else

-        killproc $PROCESS

-        RETVAL=$?

-        echo

-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE

-        return $RETVAL

-    fi

-    RETVAL=$?

-    echo

-}

-

-restart() {

-   stop

-   start

-}

-

-# See how we were called.

-case "$1" in

-    start|stop|restart)

-        $1

-        ;;

-    status)

-        if [ -f $SUSE_RELEASE ]; then

-            echo -n "Checking for service salt-master "

-            checkproc $SALTMASTER

-            rc_status -v

-        elif [ -f $DEBIAN_VERSION ]; then

-            if [ -f $LOCKFILE ]; then

-                RETVAL=0

-                echo "salt-master is running."

-            else

-                RETVAL=1

-                echo "salt-master is stopped."

-            fi

-        else

-            status $PROCESS

-            RETVAL=$?

-        fi

-        ;;

-    condrestart)

-        [ -f $LOCKFILE ] && restart || :

-        ;;

-    reload)

-        echo "can't reload configuration, you have to restart it"

-        RETVAL=1

-        ;;

-    *)

-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"

-        exit 1

-        ;;

-esac

-exit $RETVAL

deleted file mode 100644

@@ -1,325 +0,0 @@

-#!/bin/sh

-#

-# Salt minion

-###################################

-

-# LSB header

-

-### BEGIN INIT INFO

-# Provides:          salt-minion

-# Required-Start:    $all

-# Required-Stop:

-# Default-Start:     2 3 4 5

-# Default-Stop:      0 1 6

-# Short-Description: Salt minion daemon

-# Description:       This is the Salt minion daemon that can be controlled by the

-#                    Salt master.

-### END INIT INFO

-

-

-# chkconfig header

-

-# chkconfig: 345 97 04

-# description:  This is the Salt minion daemon that can be controlled by the Salt master.

-#

-# processname: /usr/bin/salt-minion

-

-# Allow these to be overridden for tests

-: "${SALTMINION_BINDIR:=/usr/bin}"

-: "${SALTMINION_SYSCONFDIR:=/etc}"

-

-# Default values (can be overridden in settings file)

-: "${USER:=$(id -nu)}"

-SALTMINION="${SALTMINION_BINDIR}/salt-minion"

-SALTCALL="${SALTMINION_BINDIR}/salt-call"

-# SALTMINION_CONFIGS are newline-separated entries of: MINION_USER CONFIG_DIR

-: "${SALTMINION_CONFIGS:="

-$USER ${SALTMINION_SYSCONFDIR}/salt

-"}"

-SALTMINION_ARGS=""

-SALTMINION_TIMEOUT=30

-SALTMINION_TICK=1

-

-SERVICE="salt-minion"

-

-# Read in settings file

-if [ -f "${SALTMINION_SYSCONFDIR}/default/salt" ]; then

-    . "${SALTMINION_SYSCONFDIR}/default/salt"

-elif [ -f "${SALTMINION_SYSCONFDIR}/sysconfig/salt" ]; then

-    . "${SALTMINION_SYSCONFDIR}/sysconfig/salt"

-fi

-

-RETVAL=0

-NS_NOTRIM="--notrim"

-ERROR_TO_DEVNULL="/dev/null"

-

-

-_su_cmd() {

-    local user="$1"

-    shift

-

-    if [ "X$USER" = "X$user" ]; then

-        eval $1

-    else

-        su -l -c "$1" "$user"

-    fi

-}

-

-

-_get_pid() {

-    netstat -n $NS_NOTRIM -ap --protocol=unix 2>$ERROR_TO_DEVNULL \

-        | sed -r -e "\|\s${SOCK_DIR}/minion_event_${MINION_ID_HASH}_pub\.ipc$|"'!d; s|/.*||; s/.*\s//;' \

-        | uniq

-}

-

-

-_is_running() {

-    [ -n "$(_get_pid)" ]

-}

-

-

-_get_salt_config_value() {

-    _su_cmd \

-        "$MINION_USER" \

-        "\

-            \"$SALTCALL\" \

-            -c \"$CONFIG_DIR\" \

-            --no-color \

-            --skip-grains \

-            --local config.get \

-            \"$1\" \

-        " \

-        2>$ERROR_TO_DEVNULL \

-        | sed -r -e '2!d; s/^\s*//;'

-}

-

-

-_make_id_hash() {

-    # $1 - minion_id

-    local hasher=''

-

-    case "$(_get_salt_config_value hash_type)" in

-        (md5) hasher="md5sum";;

-        (sha1) hasher="sha1sum";;

-        (sha224) hasher="sha224sum";;

-        (sha256) hasher="sha256sum";;

-        (sha384) hasher="sha384sum";;

-        (sha512) hasher="sha512sum";;

-        (*) echo "ERROR: No salt hash_type specified";;

-    esac

-

-    if [ -n "$hasher" ]; then

-        printf "$1" | "$hasher" | cut -c 1-10

-    fi

-}

-

-

-start() {

-    # $1 - config dir

-    local retval=0

-

-    if _is_running; then

-        echo "Service $SERVICE:$MINION_USER:$MINION_ID already running"

-        return 0

-    fi

-

-    echo -n "Starting $SERVICE:$MINION_USER:$MINION_ID daemon: "

-

-    _su_cmd \

-        "$MINION_USER" \

-        "\

-            \"$SALTMINION\" \

-            -c \"$CONFIG_DIR\" \

-            -d $SALTMINION_ARGS \

-            ${SALTMINION_DEBUG:+-l debug} \

-        " \

-        2>$ERROR_TO_DEVNULL \

-        || retval=$?

-

-    if [ 0 -eq "$retval" ]; then

-        local endtime=$(($(date '+%s')+$SALTMINION_TIMEOUT))

-        while ! _is_running; do

-            if [ "$endtime" -lt "$(date '+%s')" ]; then

-                echo -n "TIMEOUT "

-                retval=1

-                break

-            fi

-            sleep $SALTMINION_TICK

-        done

-    fi

-

-    if [ 0 -eq "$retval" ]; then

-        echo -n "OK"

-    else

-        echo -n "FAIL"

-        if [ -n "$SALTMINION_DEBUG" ]; then

-            printf "\nPROCESSES:\n" >&2

-            ps wwwaxu | grep '[s]alt-minion' >&2

-            printf "\nSOCKETS:\n" >&2

-            netstat -n $NS_NOTRIM -ap --protocol=unix | grep 'salt.*minion' >&2

-            printf "\nLOG_FILE:\n" >&2

-            tail -n 20 "$LOG_FILE" >&2

-            printf "\nENVIRONMENT:\n" >&2

-            env >&2

-        fi

-    fi

-    echo

-

-    return $retval

-}

-

-

-stop() {

-    # $1 - config dir

-    local retval=0

-

-    if ! _is_running; then

-        echo "Service $SERVICE:$MINION_USER:$MINION_ID is not running"

-        return 0

-    fi

-        

-    echo -n "Stopping $SERVICE:$MINION_USER:$MINION_ID daemon: "

-    local pid="$(_get_pid)"

-

-    # pid below is intentionally not quoted in case there are *multiple*

-    # minions running with the same configuration.

-    _su_cmd "$MINION_USER" "kill -TERM $pid 2>/dev/null" || retval=$?

-    if [ 0 -eq "$retval" ]; then 

-        local endtime=$(($(date '+%s')+$SALTMINION_TIMEOUT))

-        while _is_running; do

-            if [ "$endtime" -lt "$(date '+%s')" ]; then

-                # Try one more time with a big hammer

-                _su_cmd "$MINION_USER" "kill -KILL $pid 2>/dev/null" || :

-                sleep $SALTMINION_TICK

-                if _is_running; then

-                    echo -n "TIMEOUT "

-                    retval=1

-                fi

-                break

-            fi

-            sleep 1

-        done

-

-    fi

-

-    if [ 0 -eq "$retval" ]; then

-        rm -f "$PID_FILE"

-        echo -n "OK"

-    else

-        echo -n "FAIL"

-    fi

-

-    echo

-

-    return $retval

-}

-

-

-status() {

-    local retval=0

-    local pid="$(_get_pid)"

-

-    if [ -n "$pid" ]; then

-        # Unquote $pid here to display multiple PIDs in one line

-        echo "$SERVICE:$MINION_USER:$MINION_ID is running:" $pid

-    else

-        retval=3

-        echo "$SERVICE:$MINION_USER:$MINION_ID is stopped."

-        if [ -e "$PID_FILE" ]; then

-            echo "$SERVICE:$MINION_USER:$MINION_ID has orphaned pid file: $PID_FILE."

-            retval=1

-        fi

-    fi

-    return $retval

-}

-

-restart() {

-    # $1 - config dir

-    stop "$1"

-    start "$1"

-}

-

-

-main() {

-    if [ -n "$SALTMINION_DEBUG" ]; then

-        set -x

-        ERROR_TO_DEVNULL="&2"

-    fi

-

-    # Check to see if --notrim is a valid netstat option

-    if ! ( netstat --help 2>&1 | grep -wq '\-\-notrim') ; then

-        NS_NOTRIM=''

-    fi

-

-    # Pre-filter for unhandled commands

-    case "$1" in

-        (start|stop|status|restart|condrestart|try-restart) ;;

-        (reload)

-            echo "Can't reload $SERVICE - you must restart it"

-            exit 3

-            ;;

-        (*)

-            echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"

-            exit 2

-            ;;

-    esac

-

-    while read MINION_USER CONFIG_DIR; do

-        if [ -z "$CONFIG_DIR" ]; then

-            continue

-        fi

-

-        if ! [ -d "$CONFIG_DIR" ]; then

-            echo "ERROR: non-existent $SERVICE config directory: $CONFIG_DIR"

-            RETVAL=1

-            continue

-        fi

-

-        SOCK_DIR="$(_get_salt_config_value sock_dir)"

-        PID_FILE="$(_get_salt_config_value pidfile)"

-        LOG_FILE="$(_get_salt_config_value log_file)"

-        MINION_ID="$(_get_salt_config_value id)"

-        MINION_ID_HASH="$(_make_id_hash "$MINION_ID")"

-        if [ \

-            -z "$SOCK_DIR" \

-            -o -z "$PID_FILE" \

-            -o -z "$LOG_FILE" \

-            -o -z "$MINION_ID" \

-            -o -z "$MINION_ID_HASH" \

-        ]; then

-            echo "ERROR: Unable to look-up config values for $CONFIG_DIR"

-            RETVAL=1

-            continue

-        fi

-

-        # See how we were called.

-        case "$1" in

-            (start|stop|restart|status)

-                "$1" || RETVAL=$?

-                ;;

-            (condrestart|try-restart)

-                if ! _is_running; then

-                    RETVAL=7

-                else

-                    stop

-                    start || RETVAL=$?

-                fi

-                ;;

-            (*)

-                echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"

-                RETVAL=2

-                ;;

-        esac

-    done <<EOF

-$SALTMINION_CONFIGS

-EOF

-

-    exit $RETVAL

-}

-

-

-if [ "$#" = 0 ]; then

-    main

-else

-    main "$@"

-fi

deleted file mode 100644

@@ -1,136 +0,0 @@

-#!/bin/sh

-#

-# Salt syndic

-###################################

-

-# LSB header

-

-### BEGIN INIT INFO

-# Provides:          salt-syndic

-# Required-Start:    $all

-# Required-Stop:

-# Default-Start:     2 3 4 5

-# Default-Stop:      0 1 6

-# Short-Description: Salt syndic master-minion passthrough daemon

-# Description:       This is a the Salt syndic daemon that enables Salt master-minion

-#                    remote control passthrough.

-### END INIT INFO

-

-

-# chkconfig header

-

-# chkconfig: - 99 99

-# description:  This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.

-#

-# processname: /usr/bin/salt-syndic

-

-

-DEBIAN_VERSION=/etc/debian_version

-SUSE_RELEASE=/etc/SuSE-release

-# Source function library.

-if [ -f $DEBIAN_VERSION ]; then

-   break

-elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then

-    . /etc/rc.status

-else

-    . /etc/rc.d/init.d/functions

-fi

-

-# Default values (can be overridden below)

-SALTSYNDIC=/usr/bin/salt-syndic

-PYTHON=/usr/bin/python

-SYNDIC_ARGS=""

-

-if [ -f /etc/default/salt ]; then

-    . /etc/default/salt

-fi

-

-SERVICE=salt-syndic

-PROCESS=salt-syndic

-

-RETVAL=0

-

-start() {

-    echo -n $"Starting salt-syndic daemon: "

-    if [ -f $SUSE_RELEASE ]; then

-        startproc -f -p /var/run/$SERVICE.pid $SALTSYNDIC -d $SYNDIC_ARGS

-        rc_status -v

-    elif [ -e $DEBIAN_VERSION ]; then

-        if [ -f $LOCKFILE ]; then

-            echo -n "already started, lock file found"

-            RETVAL=1

-        elif $PYTHON $SALTSYNDIC -d $SYNDIC_ARGS >& /dev/null; then

-            echo -n "OK"

-            RETVAL=0

-        fi

-    else

-        daemon --check $SERVICE $SALTSYNDIC -d $SYNDIC_ARGS

-        RETVAL=$?

-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE

-        echo

-        return $RETVAL

-    fi

-    RETVAL=$?

-    echo

-    return $RETVAL

-}

-

-stop() {

-    echo -n $"Stopping salt-syndic daemon: "

-    if [ -f $SUSE_RELEASE ]; then

-        killproc -TERM $SALTSYNDIC

-        rc_status -v

-    elif [ -f $DEBIAN_VERSION ]; then

-        # Added this since Debian's start-stop-daemon doesn't support spawned processes

-        if ps -ef | grep "$PYTHON $SALTSYNDIC" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then

-            echo -n "OK"

-            RETVAL=0

-        else

-            echo -n "Daemon is not started"

-            RETVAL=1

-        fi

-    else

-        killproc $PROCESS

-        RETVAL=$?

-        echo

-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE

-        return $RETVAL

-    fi

-    RETVAL=$?

-    echo

-}

-

-restart() {

-   stop

-   start

-}

-

-# See how we were called.

-case "$1" in

-    start|stop|restart)

-        $1

-        ;;

-    status)

-        if [ -f $SUSE_RELEASE ]; then

-            echo -n "Checking for service salt-syndic "

-            checkproc $SALTSYNDIC

-            rc_status -v

-        elif [ -f $DEBIAN_VERSION ]; then

-            if [ -f $LOCKFILE ]; then

-                RETVAL=0

-                echo "salt-syndic is running."

-            else

-                RETVAL=1

-                echo "salt-syndic is stopped."

-            fi

-        else

-            status $PROCESS

-            RETVAL=$?

-        fi

-        ;;

-    *)

-        echo $"Usage: $0 {start|stop|status|restart}"

-        exit 1

-        ;;

-esac

-exit $RETVAL

@@ -8,7 +8,7 @@

 %define _salttesting_ver 2016.5.11

 Name:           salt3

-Version:        3003

+Version:        3003.1

 Release:        1%{?dist}

 Summary:        A parallel remote execution system with python3

 Group:          System Environment/Daemons

@@ -16,8 +16,8 @@ License:        ASL 2.0

 URL:            http://saltstack.org/

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Source0:        https://github.com/saltstack/salt/releases/download/v%{version}/salt/salt-%{version}.tar.gz

-%define sha1    salt=c65f660de100f8af9f318ff19dbb9bf632955701

+Source0:        https://github.com/saltstack/salt/releases/download/v%{version}/salt-%{version}.tar.gz

+%define sha1    salt=931e1cc51c4d75f3ad60ca17f05152c4ca3c1426

 Source1:        https://pypi.python.org/packages/source/S/SaltTesting/SaltTesting-2016.5.11.tar.gz

 %define         sha1 SaltTesting=474dbd7029e3d48cdb468be3c63b2262e47556c8

 Source2:        salt-master.service

@@ -25,6 +25,7 @@ Source3:        salt-syndic.service

 Source4:        salt-minion.service

 Source5:        salt-api.service

 Source6:        logrotate.salt

+Patch0:         requirements.patch

 BuildRoot:      %{_tmppath}/salt-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildArch:      noarch

 %ifarch %{ix86} x86_64

@@ -123,14 +124,13 @@ Requires:       %{name} = %{version}-%{release}

 Salt Package Manager

 %prep

-%setup -c -n salt-%{version}

-cd salt-%{version}

+%autosetup -n salt-%{version} -p1

 %build

 %install

 rm -rf %{buildroot}

-cd $RPM_BUILD_DIR/salt-%{version}/salt-%{version}

+cd $RPM_BUILD_DIR/salt-%{version}

 python3 setup.py install -O1 --root %{buildroot}

 # Add some directories

@@ -159,16 +159,14 @@ install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/salt

 %clean

 rm -rf %{buildroot}

-

 %files

 %defattr(-,root,root,-)

-%doc $RPM_BUILD_DIR/salt-%{version}/salt-%{version}/LICENSE

+%doc $RPM_BUILD_DIR/salt-%{version}/LICENSE

 %{python3_sitelib}/salt/*

 %{python3_sitelib}/salt-*-py?.?.egg-info

 %{_sysconfdir}/logrotate.d/salt

 %{_var}/cache/salt

-

 %files master

 %defattr(-,root,root)

 %doc %{_mandir}/man7/salt.7.*

@@ -302,6 +300,8 @@ rm -rf %{buildroot}

 %endif

 %changelog

+* Fri Jul 23 2021 Bryce Larson <brycel@vmware.com> 3003.1-1

+- Update to version 3003.1

 * Tue Jun 15 2021 Keerthana K <keerthanak@vmware.com> 3003-1

 - Update to version 3003

 * Wed Feb 03 2021 Tapas Kundu <tkundu@vmware.com> 3001.1-2