next iteration

3 files changed, 94 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5dbc44930d7f..bd66b69a760a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -55,6 +55,7 @@ pkgbase = kopano-core-git
 	depends = python-dateutil
 	depends = python-pilkit
 	optdepends = gperftools
+	provides = kopano-core=9.0.12
 	backup = etc/kopano/*.cfg
 	source = kopano-core-git::git+https://stash.kopano.io/scm/kc/kopanocore.git#branch=master
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d1eed9e977ad..f64306a39a41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,6 +27,14 @@ _tagPrefix="kopanocore-"
 #_tagPrefix=""
 #_tagSuffix=""
 
+_basePkgName="${pkgname//-git/}"
+
+if [[ "${pkgname}" == *-git ]];
+then
+    # Version can't be set before pkgver has run
+    provides+=("${pkgname//-git/}=${pkgver}")
+fi
+
 _gitLogByDay() {
     local NEXT=$(date +%F)
     local SINCE="1970-01-01"
@@ -54,7 +62,7 @@ pkgver() {
     if [[ "${pkgname}" == *-git ]];
     then
 	_lastTag=$(git tag -l "${_tagPrefix}*" --sort=v:refname | tail -n 1)
-	_revision="r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+	_revision="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 	if [ ! -z "${_lastTag}" ];
 	then
 	    echo "${_lastTag}" | sed "s|${_tagPrefix}\(.*\)${_tagSuffix}|\1.r${_revision}|"
@@ -162,8 +170,9 @@ optdepends=(
     # 'libs3'
 	    )
 
+# TODO _licenseDir is supposed to be the pkgname. For unification changed here.
 _confDir="etc/kopano"
-_licenseDir="usr/share/licenses/${pkgname}"
+_licenseDir="usr/share/licenses/kopano"
 _docDir="usr/share/doc/kopano"
 
 install='install'
diff --git a/changelog b/changelog
index e69de29bb2d1..e68495be7234 100644
--- a/changelog
+++ b/changelog
@@ -0,0 +1,82 @@
+
+[2020-02-19]
+* init Your Name
+
+[2020-03-09]
+* build by method - lets see how far it gets Martina Pietruschka
+
+[2020-03-10]
+* comilable Martina Pietruschka
+
+[2020-12-23]
+* fresh start with kopano master Your Name
+* vmime update Your Name
+* handle new pkg format Your Name
+* syntax error Your Name
+* deps Your Name
+
+[2020-12-24]
+* deps Your Name
+
+[2020-12-26]
+* vmime deps Your Name
+
+[2020-12-28]
+* set next version Your Name
+* formatting and dependencies Your Name
+* test version Your Name
+* test vmime from kopanp Your Name
+
+[2020-12-29]
+* integrate kopano-vmime Your Name
+* changed libvmime src. added gperftools. added packaging Your Name
+* changed libvmime src. added gperftools. added packagin Your Name
+* dont set python path Your Name
+
+[2020-12-30]
+* test build Your Name
+
+[2020-12-31]
+* test build Your Name
+
+[2021-01-02]
+* fix python install path Your Name
+* patch Your Name
+* package as is Your Name
+* set libdir Your Name
+* different prefix Your Name
+
+[2021-01-03]
+* different prefix Your Name
+* change sbin location Your Name
+* docs and configs Your Name
+* autodetect branch Your Name
+* assignment Your Name
+* -git test Your Name
+
+[2021-01-04]
+* -git test Your Name
+* finalized -git test Your Name
+* add pythen dependencies ; add optional dependencies to make dependencies ; first files for templates Your Name
+
+[2021-01-05]
+* webapp first try Your Name
+* fixed cp Your Name
+* fixed relnotes path Your Name
+* removed/added destdir / added ant-contrib Your Name
+* fixed path Your Name
+
+[2021-01-07]
+* webapp Your Name
+
+[2021-01-08]
+* use templates Your Name
+
+[2021-01-13]
+* distribute /etc/kopano/*.cfg in kopano-core package Your Name
+
+[2021-01-14]
+* distribute /etc/kopano/*.cfg in kopano-core package Your Name
+
+[2021-01-20]
+* handle git builds Your Name