next iteration

2 files changed, 10 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1d4279b50d48..c4aa40c0f60d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,11 +22,10 @@ _tagPrefix="v"
 #_tagSuffix=""
 
 _basePkgName="${pkgname//-git/}"
-
 if [[ "${pkgname}" == *-git ]];
 then
     # Version can't be set before pkgver has run
-    provides+=("${pkgname//-git/}=${pkgver}")
+    provides+=("${_basePkgName}=${pkgver}")
 fi
 
 _gitLogByDay() {
@@ -71,6 +70,7 @@ pkgver() {
 
 _sourceBranch=$(if [[ "${pkgname}" == *-git ]]; then echo "#branch=master"; else echo "#tag=${_tagPrefix}${pkgver}${_tagSuffix}"; fi)
 # template end;
+
 conflicts=(
     'zarafa-libvmime'
 	  )
diff --git a/changelog b/changelog
index f8ea320b7ffd..6dad4a6d7b38 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,10 @@
 
-[2020-12-29]
-* integrate kopano-vmime
+[2021-01-04]
+* -git/master-packages
 
-[2021-01-20]
-* handle git builds
+[2021-01-22]
+* changes from 20201207
+
+[2021-01-26]
+* Fixed build with ICU 68.2-1
+* add build hooks