From 846f47fe4c048df216960c0dace66e308de7dfc6 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 6 Aug 2021 15:09:46 +0200
Subject: [PATCH] README,*.sh: use the new upstream namespace

---
 README            | 12 +++++++-----
 make-srpm.sh      |  6 +++---
 upload-release.sh |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 189c9cf7..281eae91 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-codescan-diff utilities
-=======================
+csdiff, csgrep, and friends
+===========================
 This repository contains source codes of the csdiff tool for comparing code
 scan defect lists in order to find out added or fixed defects, and the csgrep
 utility for filtering defect lists using various filtering predicates.  You
 can find the up2date sources in the following repository:
 
-    https://github.com/kdudka/csdiff
+    https://github.com/csutils/csdiff
 
 The codescan-diff utilities are licensed under GPLv3+, see COPYING for details.
 Please report bugs and feature requests on GitHub using the above URL.
@@ -13,9 +13,9 @@ Please report bugs and feature requests on GitHub using the above URL.
 
 Dependences
 -----------
-    * Boost 1.41+
+    * Boost C++ Libraries
 
-    * CMake 2.8+
+    * CMake 2.8.12+
 
 
 Manual Installation
@@ -49,6 +49,8 @@ List of Utilities
 
     cssort - sort the given defect list by the selected key
 
+    cstrans-df-run - transform RUN line in a Dockerfile
+
 
 Documentation
 -------------
diff --git a/make-srpm.sh b/make-srpm.sh
index 617712ff..fbeb0238 100755
--- a/make-srpm.sh
+++ b/make-srpm.sh
@@ -47,7 +47,7 @@ VER="`echo "$VER" | sed "s/-.*-/.$TIMESTAMP./"`"
 
 BRANCH="`git rev-parse --abbrev-ref HEAD`"
 test -n "$BRANCH" || die "failed to get current branch name"
-test master = "${BRANCH}" || VER="${VER}.${BRANCH//-/_}"
+test "main" = "${BRANCH}" || VER="${VER}.${BRANCH//-/_}"
 test -z "`git diff HEAD`" || VER="${VER}.dirty"
 
 NV="${PKG}-${VER}"
@@ -87,8 +87,8 @@ Release:    1%{?dist}
 Summary:    Non-interactive tools for processing code scan results in plain-text
 
 License:    GPLv3+
-URL:        https://github.com/kdudka/csdiff
-Source0:    https://github.com/kdudka/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
+URL:        https://github.com/csutils/csdiff
+Source0:    https://github.com/csutils/csdiff/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
 
 # the following upstream commit is needed to work with up2date csdiff/csgrep
 # https://github.com/kdudka/csmock/commit/48b09b3a
diff --git a/upload-release.sh b/upload-release.sh
index 581d96dd..f8452103 100755
--- a/upload-release.sh
+++ b/upload-release.sh
@@ -44,12 +44,12 @@ done
 JSON="./${NV}-github-relase.js"
 
 # create a new release on GitHub
-curl "https://api.github.com/repos/${USER}/${NAME}/releases" \
+curl "https://api.github.com/repos/csutils/${NAME}/releases" \
     -o "$JSON" --fail --verbose \
     --header "Authorization: token $TOKEN" \
     --data '{
     "tag_name": "'"$TAG"'",
-    "target_commitish": "master",
+    "target_commitish": "main",
     "name": "'"$NV"'",
     "draft": false,
     "prerelease": false