Fedora COPR support

- Support .copr/Makefile for 'SCM / make srpm' COPR package
- Use genrpm.sh to generate srpm and optionally build it
- Use generic substitution syntax in specfile

.copr/Makefile

@@ -0,0 +1,19 @@
+.PHONY: deps srpm
+.DEFAULT_GOAL := srpm
+
+DOT_COPR := $(dir $(firstword $(MAKEFILE_LIST)))
+TOP_DIR := $(realpath $(DOT_COPR)/../)
+
+RPM_DIR := $(TOP_DIR)/rpm
+outdir ?= $(RPM_DIR)/SRPMS
+
+HAS_GIT := $(shell command -v git 2> /dev/null)
+ifndef HAS_GIT
+deps:
+	dnf -y install git
+else
+deps:
+endif
+
+srpm: deps
+	$(TOP_DIR)/rpm/genrpm.sh -o $(outdir)

rpm/SPECS/shadowsocks-libev.spec.in

@@ -6,7 +6,7 @@
 %if 0%{?suse_version}
 %global requires   %{?requires} libcap-progs
 %endif
-%global project_desc shadowsocks-libev is a lightweight secured scoks5 proxy for embedded devices and low end boxes.
+%global project_desc shadowsocks-libev is a lightweight secured socks5 proxy for embedded devices and low end boxes.
 
 %if 0%{?fedora} >= 15 || 0%{?rhel} >=7 || 0%{?suse_version} >= 1210
 %global use_systemd 1
@@ -14,15 +14,15 @@
 %global use_systemd 0
 %endif
 
-Name:	    	shadowsocks-libev
-Version:	    VERSION
-Release:	    1%{?dist}
+Name:		    @NAME@
+Version:	    @VERSION@
+Release:	    @RELEASE@%{?dist}
 Summary:	    A lightweight and secure socks5 proxy
 
 Group:		    Applications/Internet
 License:	    GPLv3+
 URL:		    https://github.com/shadowsocks/%{name}
-Source0:	    %{url}/archive/v%{version}.tar.gz
+Source0:	    @SOURCE@
 
 BuildRequires:	make gcc pcre-devel asciidoc xmlto automake libtool mbedtls-devel libsodium-devel >= 1.0.4 libev-devel c-ares-devel
 %if 0%{?suse_version}
@@ -48,7 +48,7 @@ BuildRequires:   systemd
 %{?project_desc}
 
 %prep
-%setup -q
+%setup -q -n @NAME_VERSION@
 
 %build
 ./autogen.sh

rpm/genrpm.sh

@@ -1,87 +1,97 @@
 #!/usr/bin/env bash
 set -e
 
+NAME=shadowsocks-libev
+
 SELF=$(readlink -f -- "$0")
 HERE=$(dirname -- "$SELF")
 
+OUTDIR="${HERE}"/SRPMS
+SOURCES="${HERE}"/SOURCES
+SPEC_TEMPLATE="${HERE}"/SPECS/${NAME}.spec.in
+SPEC_FILE="${SPEC_TEMPLATE%%.in}"
+
+GIT_VERSION=$("${HERE}"/../scripts/git_version.sh)
+
+OPT_OUTDIR="${OUTDIR}"
+OPT_USE_SYSTEM_LIB=0
+OUT_BUILD_RPM=0
+
+version=$(echo ${GIT_VERSION} | cut -d' ' -f1)
+release=$(echo ${GIT_VERSION} | cut -d' ' -f2)
+
+name_version=${NAME}-${version}-${release}
+source_name=${name_version}.tar.gz
+
+archive()
+{
+    "${HERE}"/../scripts/git_archive.sh -o "${SOURCES}" -n ${name_version}
+}
+
+build_src_rpm()
+{
+    rpmbuild -bs "${SPEC_FILE}" \
+       --undefine "dist" \
+       --define "%_topdir ${HERE}" \
+       --define "%_srcrpmdir ${OPT_OUTDIR}"
+}
+
+build_rpm()
+{
+    echo "${OPT_USE_SYSTEM_LIB}"
+    rpmbuild --rebuild "${OUTDIR}"/${name_version}.src.rpm \
+       --define "%_topdir ${HERE}" \
+       --define "%use_system_lib ${OPT_USE_SYSTEM_LIB}"
+}
+
+create_spec()
+{
+    sed -e "s/@NAME@/${NAME}/g" \
+        -e "s/@VERSION@/${version}/g" \
+        -e "s/@RELEASE@/${release}/g" \
+        -e "s/@SOURCE@/${source_name}/g" \
+        -e "s/@NAME_VERSION@/${name_version}/g" \
+        "${SPEC_TEMPLATE}" > "${SPEC_FILE}"
+}
+
 show_help()
 {
-    echo -e "`basename $0` [OPTION...]"
+    echo -e "$(basename $0) [OPTION...]"
+    echo -e "Create and build shadowsocks-libev SRPM"
     echo
     echo -e "Options:"
     echo -e "  -h    show this help."
-    echo -e "  -s    use system shared libraries"
+    echo -e "  -b    use rpmbuld to build resulting SRPM"
+    echo -e "  -s    use system shared libraries (RPM only)"
+    echo -e "  -o    output directory"
 }
 
-OPT_USE_SYSTEM_LIB=0
-
-while getopts "hs" opt
+while getopts "hbso:" opt
 do
     case ${opt} in
         h)
             show_help
             exit 0
             ;;
-
-		s)
+        b)
+            OPT_BUILD_RPM=1
+            ;;
+        s)
             OPT_USE_SYSTEM_LIB=1
-			;;
+            ;;
+        o)
+            OPT_OUTDIR=$(readlink -f -- $OPTARG)
+            ;;
         *)
-			show_help
+            show_help
             exit 1
             ;;
     esac
 done
 
-# determine version and release number
-GIT_DESCRIBE=$(git describe --tags --match 'v*' --long)
-# GIT_DESCRIBE is like v3.0.3-11-g1e3f35c-dirty
-
-if [[ ! "$GIT_DESCRIBE" =~ ^v([^-]+)-([0-9]+)-g([0-9a-f]+)$ ]]; then
-    >&2 echo 'ERROR - unrecognized `git describe` output: '"$GIT_DESCRIBE"
-    exit 1
-fi
-
-TARGET_VERSION=${BASH_REMATCH[1]}
-TARGET_COMMITS=${BASH_REMATCH[2]}
-TARGET_SHA1=${BASH_REMATCH[3]}
-
-TARGET_RELEASE=1
-if [ "$TARGET_COMMITS" -gt 0 ]; then
-    TARGET_RELEASE+=".$TARGET_COMMITS.git$TARGET_SHA1"
+create_spec
+archive
+build_src_rpm
+if [ "${OPT_BUILD_RPM}" = "1" ] ; then
+    build_rpm
 fi
-
-TARGET_VERREL=$TARGET_VERSION-$TARGET_RELEASE
->&2 echo "INFO - RPM version-release is $TARGET_VERREL."
-
-# archive tarball from Git workspace
-export TARGET_TARBALL_NAME=shadowsocks-libev-$TARGET_VERSION
-export TARGET_TARBALL_DIR=$HERE/SOURCES
-mkdir -p -- "$TARGET_TARBALL_DIR"
-pushd "$HERE"/..
-# archive this repo
-git archive HEAD --format=tar --prefix="$TARGET_TARBALL_NAME/" \
-    -o "$TARGET_TARBALL_DIR/$TARGET_TARBALL_NAME.tar"
-# archive submodules
-git submodule update --init
-git submodule foreach 'git archive HEAD --format=tar \
-        --prefix="$TARGET_TARBALL_NAME/$path/" \
-        -o "$TARGET_TARBALL_DIR/$TARGET_TARBALL_NAME-submodule-$path-$sha1.tar"
-    tar -n --concatenate --file="$TARGET_TARBALL_DIR/$TARGET_TARBALL_NAME.tar" \
-        "$TARGET_TARBALL_DIR/$TARGET_TARBALL_NAME-submodule-$path-$sha1.tar"'
-gzip -c "$TARGET_TARBALL_DIR/$TARGET_TARBALL_NAME.tar" > "$TARGET_TARBALL_DIR/$TARGET_TARBALL_NAME.tar.gz"
-popd
-
-# generate spec file
-TARGET_SPEC_DIR=$HERE/SPECS
-mkdir -p -- "$TARGET_SPEC_DIR"
-TARGET_SPEC_PATH=$TARGET_SPEC_DIR/shadowsocks-libev.spec
-sed -e "s/^\(Version:\).*$/\1       ${TARGET_VERSION}/" \
-    -e "s/^\(Release:\).*$/\1       ${TARGET_RELEASE}%{?dist}/" \
-    -e "s/^\(Source0:\).*$/\1       ${TARGET_TARBALL_NAME}.tar.gz/" \
-    "${TARGET_SPEC_PATH}".in > "${TARGET_SPEC_PATH}"
-
-# build rpms
-rpmbuild -ba "$TARGET_SPEC_PATH" \
-         --define "%_topdir $HERE" \
-         --define "%use_system_lib $OPT_USE_SYSTEM_LIB"

scripts/git_archive.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -e
+
+archive() {
+    export TARBALL_NAME=$1
+    export TARBALL_OUTDIR=$2
+
+    # archive this repo
+    cd "$(git rev-parse --show-toplevel)"
+    git archive HEAD --format=tar --prefix="${TARBALL_NAME}/" \
+        -o "${TARBALL_OUTDIR}/${TARBALL_NAME}.tar"
+    # archive submodules
+    git submodule update --init
+    git submodule foreach --quiet 'git archive HEAD --format=tar \
+            --prefix="${TARBALL_NAME}/${path}/" \
+            -o "${TARBALL_OUTDIR}/${TARBALL_NAME}-submodule-${path}-${sha1}.tar"
+        tar -n --concatenate --file="${TARBALL_OUTDIR}/${TARBALL_NAME}.tar" \
+            "${TARBALL_OUTDIR}/${TARBALL_NAME}-submodule-${path}-${sha1}.tar"'
+    gzip -c "${TARBALL_OUTDIR}/${TARBALL_NAME}.tar" > "${TARBALL_OUTDIR}/${TARBALL_NAME}.tar.gz"
+
+    # clean-up
+    git submodule foreach --quiet 'rm ${TARBALL_OUTDIR}/${TARBALL_NAME}-submodule-${path}-${sha1}.tar'
+    rm "${TARBALL_OUTDIR}/${TARBALL_NAME}.tar"
+}
+
+TARGET_TARBALL_NAME=shadowsocks-libev
+TARGET_TARBALL_DIR=$(git rev-parse --show-toplevel)
+
+while getopts "n:o:" opt
+do
+    case ${opt} in
+        o)
+            TARGET_TARBALL_DIR=$(readlink -f -- $OPTARG)
+            ;;
+        n)
+            TARGET_TARBALL_NAME=$OPTARG
+            ;;
+        \?)
+            exit 1
+            ;;
+    esac
+done
+
+archive "${TARGET_TARBALL_NAME}" "${TARGET_TARBALL_DIR}"

scripts/git_version.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -e
+
+# determine version and release number
+GIT_DESCRIBE=$(git describe --tags --match 'v*' --long)
+# GIT_DESCRIBE is like v3.0.3-11-g1e3f35c-dirty
+if [[ ! "$GIT_DESCRIBE" =~ ^v([^-]+)-([0-9]+)-g([0-9a-f]+)$ ]]; then
+    >&2 echo 'ERROR - unrecognized `git describe` output: '"$GIT_DESCRIBE"
+    exit 1
+fi
+
+version=${BASH_REMATCH[1]}
+commits=${BASH_REMATCH[2]}
+short_hash=${BASH_REMATCH[3]}
+
+release=1
+if [ "${commits}" -gt 0 ] ; then
+    release+=.${commits}.git${short_hash}
+fi
+
+echo "${version} ${release}"