From 4d395f85bbb9ae595978669fe185332a29cf755e Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Sun, 30 Jan 2022 20:21:13 +0000 Subject: [PATCH] [packaging] Fix COPR building system Signed-off-by: Przemo Firszt --- package/fedora/rpkg.conf | 1 + package/fedora/rpkg.macros | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 package/fedora/rpkg.macros diff --git a/package/fedora/rpkg.conf b/package/fedora/rpkg.conf index 568189890b..07bc74aa96 100644 --- a/package/fedora/rpkg.conf +++ b/package/fedora/rpkg.conf @@ -1,2 +1,3 @@ [rpkg] auto_pack = False +user_macros = "${git_props:root}/rpkg.macros" diff --git a/package/fedora/rpkg.macros b/package/fedora/rpkg.macros deleted file mode 100644 index b064d67006..0000000000 --- a/package/fedora/rpkg.macros +++ /dev/null @@ -1,4 +0,0 @@ -function git_commit_no { - commits=$(curl -s 'https://api.github.com/repos/FreeCAD/FreeCAD/compare/120ca87015...master' | grep "ahead_by" | sed -s 's/ //g' | sed -s 's/"ahead_by"://' | sed -s 's/,//') - echo -n $((commits + 1)) -}