From 19db9793df34fe5ce7b7e17bd4f849a03d69a36d Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Wed, 31 May 2023 17:14:29 +1000 Subject: [PATCH] remove duplicate names --- rename-e-smith-pkg.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rename-e-smith-pkg.sh b/rename-e-smith-pkg.sh index 27cdb64..498a708 100644 --- a/rename-e-smith-pkg.sh +++ b/rename-e-smith-pkg.sh @@ -229,7 +229,7 @@ mv "$SOURCEPKG.spec" "$TARGETPKG.spec" #Update smeserver-.spec # - change name to smeserver- (%define name) -sed -i "s/^%define name */%define name $TARGETPKG/" "$TARGETPKG.spec" +sed -i "s/^%define name.*$SOURCEPKG/%define name $TARGETPKG/" "$TARGETPKG.spec" # - change all Requires: and BuildRequires: e-smith* to smeserver* sed -i 's/^Requires:.*e-smith/Requires: smeserver/g' "$TARGETPKG.spec" @@ -239,7 +239,7 @@ sed -i 's/^BuildRequires:.*e-smith/BuildRequires: smeserver/g' "$TARGETPKG.spec" # Bump the release and add changelog change-log "$TARGETPKG.spec" # and edit in the reason and add by whom -sed -i "s/fix \[SME: \]/Rename to smeserver-$TARGETPKG \[SME: 12359\]/" "$TARGETPKG.spec" +sed -i "s/fix \[SME: \]/Rename to $TARGETPKG \[SME: 12359\]/" "$TARGETPKG.spec" sed -i 's/ME MYSELF /rename-e-smith-pkg.sh aka Trevor Batley /' "$TARGETPKG.spec" # - add PROVIDES: smeserver- @@ -259,6 +259,6 @@ if [ !e archivefilename ] ; then rm archivefilename ; fi # - if there is an e-smith--update event rename to smeserver--update and add symlink git commit -m "rename-e-smith-pkg script (#12359)" -pit push origin master +git push origin master #Convert repository to a Regular Repository (rather than fork)