From e549496d1bb6ca17c6174d0eb4d79def73810bf3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 12 Aug 2021 17:23:18 +0200
Subject: [PATCH] README,doc,*.sh: use the new upstream namespace

---
 README            | 2 +-
 doc/csexec.adoc   | 2 +-
 doc/cswrap.adoc   | 2 +-
 make-srpm.sh      | 6 +++---
 upload-release.sh | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README b/README
index f817fe6..401c118 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ compiler (gcc, g++, ...) and put it to your $PATH.  cswrap --help prints usage
 to standard error output.  You can find the up2date sources in the following
 repository:
 
-    https://github.com/kdudka/cswrap
+    https://github.com/csutils/cswrap
 
 cswrap is licensed under GPLv3+, see COPYING for details.  Please report bugs
 and feature requests on GitHub using the above URL.
diff --git a/doc/csexec.adoc b/doc/csexec.adoc
index d1d1535..8acce7b 100644
--- a/doc/csexec.adoc
+++ b/doc/csexec.adoc
@@ -62,7 +62,7 @@ ENVIRONMENT VARIABLES
 
 BUGS
 ----
-Please report bugs and feature requests at https://github.com/kdudka/cswrap .
+Please report bugs and feature requests at https://github.com/csutils/cswrap .
 
 
 AUTHOR
diff --git a/doc/cswrap.adoc b/doc/cswrap.adoc
index c4e9ede..75ec6f1 100644
--- a/doc/cswrap.adoc
+++ b/doc/cswrap.adoc
@@ -85,7 +85,7 @@ ENVIRONMENT VARIABLES
 
 BUGS
 ----
-Please report bugs and feature requests at https://github.com/kdudka/cswrap .
+Please report bugs and feature requests at https://github.com/csutils/cswrap .
 
 
 AUTHOR
diff --git a/make-srpm.sh b/make-srpm.sh
index 8b1c9de..5bb10a9 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}"
@@ -79,8 +79,8 @@ Summary:    Generic compiler wrapper
 
 Group:      Development/Tools
 License:    GPLv3+
-URL:        https://github.com/kdudka/%{name}
-Source0:    https://github.com/kdudka/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
+URL:        https://github.com/csutils/%{name}
+Source0:    https://github.com/csutils/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz
 
 # cswrap-1.3.0+ emits internal warnings per timed out scans (used by csdiff to
 # eliminate false positivies that such a scan would otherwise cause) ==> force
diff --git a/upload-release.sh b/upload-release.sh
index 9afd6e1..2fab8f0 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