next iteration

3 files changed, 73 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bb07f26bc09..a41b1ad51400 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,6 +3,7 @@ pkgbase = kopano-libvmime-git
 	pkgver = 0.9.2k4
 	pkgrel = 1
 	url = http://www.vmime.org/
+	changelog = changelog
 	arch = armv7l
 	arch = aarch64
 	arch = i686
@@ -15,11 +16,10 @@ pkgbase = kopano-libvmime-git
 	makedepends = git
 	depends = gsasl
 	depends = gnutls
-	provides = libvmime
-	conflicts = libvmime
-	conflicts = libvmime-git
+	provides = libvmime=${pkgver}
+	provides = kopano-libvmime=0.9.2k4
 	conflicts = zarafa-libvmime
-	source = git+https://github.com/Kopano-dev/vmime.git#tag=v0.9.2k4
+	source = kopano-libvmime-git::git+https://github.com/Kopano-dev/vmime.git#branch=master
 	md5sums = SKIP
 
 pkgname = kopano-libvmime-git
diff --git a/PKGBUILD b/PKGBUILD
index 3e5ffad164c6..5e172b2acf42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname='kopano-libvmime-git'
-provides=(
-    'libvmime'
-	 )
 pkgver=0.9.2k4
 pkgrel=1
+provides=(
+    'libvmime=${pkgver}'
+	 )
 pkgdesc='A C++ class library for working with MIME messages'
 arch=(
     'armv7l'
@@ -15,19 +15,71 @@ url='http://www.vmime.org/'
 license=(
     'GPL'
 	)
+	
+_tagPrefix="v"
+# template start; name=base-scm; version=1;
+#_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"
+    local UNTIL=$NEXT
+    local LOG_FORMAT="* %s %an"
+    git log --no-merges --since="${SINCE}" --until="${UNTIL}" --format="%cd" --date=short --follow . | sort -u | while read DATE ; do
+	local GIT_PAGER=$(git log --no-merges --reverse --format="${LOG_FORMAT}" --since="${DATE} 00:00:00" --until="${DATE} 23:59:59" --author="${AUTHOR}" --follow . | uniq)
+	if [ ! -z "$GIT_PAGER" ]
+	then
+	    echo
+	    echo -e "[$DATE]"
+	    echo -e "${GIT_PAGER}"
+	fi
+    done
+}
+if git rev-parse ;
+then
+    _gitLogByDay > changelog
+    changelog="changelog"
+fi
+
+# https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
+pkgver() {
+    cd ${srcdir}/${pkgname}
+    if [[ "${pkgname}" == *-git ]];
+    then
+	_lastTag=$(git tag -l "${_tagPrefix}*" --sort=v:refname | tail -n 1)
+	_revision="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+	if [ ! -z "${_lastTag}" ];
+	then
+	    echo "${_lastTag}" | sed "s|${_tagPrefix}\(.*\)${_tagSuffix}|\1.r${_revision}|"
+	else
+	    echo "${pkgver}" | sed "s|\(.*\)-git|1.r${_revision}|"
+	fi
+    else
+        echo ${pkgver}
+    fi
+}
+
+_sourceBranch=$(if [[ "${pkgname}" == *-git ]]; then echo "#branch=master"; else echo "#tag=${_tagPrefix}${pkgver}${_tagSuffix}"; fi)
+# template end;
 conflicts=(
-    'libvmime'
-    'libvmime-git'
     'zarafa-libvmime'
 	  )
 source=(
-    "git+https://github.com/Kopano-dev/vmime.git#tag=v${pkgver}"
+    "${pkgname}::git+https://github.com/Kopano-dev/vmime.git${_sourceBranch}"
 	)
 md5sums=(
     'SKIP'
 	)
 
-
 makedepends=(
     'cmake'
     'postfix'
@@ -42,18 +94,15 @@ depends=(
     'gnutls'
 	)
 
-prepare() {
-    mkdir build
-}
-
 build() {
+    mkdir build
     cd build
-    
-    cmake ../vmime \
+
+    cmake ../${pkgname} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_INSTALL_DIR=/usr/lib/ \
     -DCMAKE_BUILD_TYPE=Release
-    
+
     make
 }
 
diff --git a/changelog b/changelog
new file mode 100644
index 000000000000..0cbd679a328e
--- /dev/null
+++ b/changelog
@@ -0,0 +1,6 @@
+
+[2020-12-29]
+* integrate kopano-vmime Your Name
+
+[2021-01-20]
+* handle git builds Your Name