Kolab Groupware OBS

arcanist.spec Changed

@@ -1,33 +1,38 @@
-%define git_short_version_hash f1c45a3
-%define git_full_version_hash f1c45a3323ae20eefe29c0a22c7923fe8b151bbf
+%define git_short_version_hash c9337c2
+%define git_full_version_hash c9337c2ade7c76edc98d27c216ab97fc1e40d01c
 
-Summary: A command line interface to Phabricator
-Name: arcanist
-Version: 0
-Release: 0.20160727.git%{git_short_version_hash}.%{?dist}
-License: ASL 2.0
-URL: http://www.phabricator.com/docs/arcanist/
-Source0: https://github.com/phacility/arcanist/archive/%{git_full_version_hash}.tar.gz#/arcanist-%{git_short_version_hash}.tar.gz
-BuildArch: noarch
+Summary:    A command line interface to Phabricator
+Name:       arcanist
+Version:    20160806.git%{git_short_version_hash}
+Release:    1%{?dist}
 
-Requires: php-common >= 5
-Requires: libphutil
+License:    ASL 2.0
+URL:        http://www.phabricator.com/docs/arcanist/
+Source0:    https://github.com/phacility/arcanist/archive/%{git_full_version_hash}.tar.gz#/arcanist-%{git_full_version_hash}.tar.gz
+BuildArch:  noarch
+
+Requires:   bash-completion
+Requires:   php(language) >= 5
+Requires:   arcanist(libphutil)
 
 %description
 A command line interface to Phabricator
 
-
 %prep
 %setup -q -n arcanist-%{git_full_version_hash}
 
+# Not used by anyone other than upstream developers?
+rm -rf scripts/breakout.py
 
 %build
 
-
 %install
 # copy arcanist to the buildroot
 mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -a * %{buildroot}%{_datadir}/%{name}/
+cp -a bin/ scripts/ src/ %{buildroot}%{_datadir}/%{name}/
+
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
+cp -a resources/shell/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/arc
 
 # symlink the bin
 mkdir -p %{buildroot}%{_bindir}
@@ -35,12 +40,28 @@
 ln -s %{_datadir}/%{name}/bin/arc
 popd
 
+find %{buildroot}%{_datadir}/%{name}/ -type d -name test -exec rm -rvf {} \; 2>/dev/null || :
+find %{buildroot}%{_datadir}/%{name}/ -type d -name __tests__ -exec rm -rvf {} \; 2>/dev/null || :
+
+# Fix shebangs
+find %{buildroot}%{_datadir}/%{name}/ -type f -exec sed -i -r -e 's"^#!(.*)/usr/bin/env php"#!%{_bindir}/php"' {} \;
+
 %files
-%{_datadir}/%{name}
+%{!?_licensedir:%global license %doc}
+%license LICENSE
+%doc README.md
+%doc NOTICE
+%config %{_sysconfdir}/bash_completion.d/arc
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/bin
+%{_datadir}/%{name}/scripts
+%{_datadir}/%{name}/src
 %{_bindir}/arc
 
-
 %changelog
+* Tue Aug  9 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 20160727.gitc9337c2-1
+- Change the versioning scheme back to the original
+
 * Wed Aug  3 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0-0.20160727.gitf1c45a3
 - Change over the versioning scheme to use the release, not the version

arcanist-c9337c2ade7c76edc98d27c216ab97fc1e40d01c.tar.gz Added

arcanist-f1c45a3.tar.gz Deleted

gen-tar.sh Deleted

update.sh Added

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+if  ! -d "arcanist.git" ; then
+    git clone -b stable https://github.com/phacility/arcanist.git arcanist.git
+    pushd arcanist.git
+else
+    pushd arcanist.git
+    git remote set-url origin https://github.com/phacility/arcanist.git
+    git fetch origin
+    git reset --hard origin/stable
+    git clean -d -f -x
+fi
+
+git_short_version_hash=$(git rev-parse --short HEAD)
+git_full_version_hash=$(git rev-parse HEAD)
+
+commitdate=$(date +%Y%m%d --date @$(git log HEAD^1..HEAD --oneline --format=%ct | head -n 1))
+
+popd
+
+if  ! -d arcanist-${git_full_version_hash}.tar.gz ; then
+    rm -rf arcanist-*.tar.gz
+    wget --content-disposition https://github.com/phacility/arcanist/archive/${git_full_version_hash}.tar.gz#/arcanist-${git_full_version_hash}.tar.gz
+fi
+
+sed -i -r \
+    -e "s/git_short_version_hash .*/git_short_version_hash ${git_short_version_hash}/g" \
+    -e "s/git_full_version_hash .*/git_full_version_hash ${git_full_version_hash}/g" \
+    -e "s/Version:(\s+)0-9+/Version:\1${commitdate}/g" \
+    arcanist.spec
+
+rm -rf *.src.rpm
+osc ar
+
+osc build --no-verify CentOS_7 arcanist.spec && \
+    rm -rf review-arcanist/ arcanist-*.src.rpm && \
+    cp /var/tmp/build-root/CentOS_7-x86_64/home/abuild/rpmbuild/SRPMS/arcanist-*.src.rpm . && \
+    fedora-review --verbose -n arcanist
+

Changes of Revision 8