Kolab Groupware OBS

Changes of Revision 17

arcanist.spec Changed

@@ -1,11 +1,11 @@
-%define revision_date 20161022
-%define git_short_version_hash e17fe43
-%define git_full_version_hash e17fe43ca3fe6dc6dd0b5ce056f56310ea1d3d51
+%global revision_date 20161022
+%global git_short_version_hash e17fe43
+%global git_full_version_hash e17fe43ca3fe6dc6dd0b5ce056f56310ea1d3d51
 
 Summary:    A command line interface to Phabricator
 Name:       arcanist
-Version:    %{revision_date}.git%{git_short_version_hash}
-Release:    1%{?dist}
+Version:    0.%{revision_date}.git%{git_short_version_hash}
+Release:    3%{?dist}
 
 License:    ASL 2.0
 URL:        https://secure.phabricator.com/book/phabricator/article/arcanist/
@@ -14,8 +14,8 @@
 
 Requires:   bash-completion
 Requires:   php(language) >= 5
-Requires:   arcanist(libphutil) <= 20161122
-Requires:   arcanist(libphutil) >= 20160921
+Requires:   arcanist(libphutil) <= 0.20161122
+Requires:   arcanist(libphutil) >= 0.20160921
 
 %description
 A command line interface to Phabricator
@@ -33,8 +33,8 @@
 mkdir -p %{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
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
+cp -a resources/shell/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/arc
 
 # symlink the bin
 mkdir -p %{buildroot}%{_bindir}
@@ -54,7 +54,7 @@
 %license LICENSE
 %doc README.md
 %doc NOTICE
-%config %{_sysconfdir}/bash_completion.d/arc
+%{_datadir}/bash-completion/completions/arc
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/bin
 %{_datadir}/%{name}/scripts
@@ -62,6 +62,15 @@
 %{_bindir}/arc
 
 %changelog
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161022.gite17fe43-3
+- Rebuild
+
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161022.gite17fe43-2
+- Rebuild
+
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161022.gite17fe43-1
+- Rebuild
+
 * Tue Nov 29 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 20161022.gite17fe43-1
 - Promote Week #42 2016

update.sh Changed

@@ -5,31 +5,49 @@
     exit 0
 }
 
+package=$(rpmspec --query --queryformat="%{NAME}\n" *.spec | head -n 1)
+
+fedora_copr=0
 fedora_review=0
 
+copr_wait_opt="--nowait"
+
 while  $# -gt 0 ; do
     case $1 in
+        --wait)
+                copr_wait_opt=""
+                shift
+            ;;
+
+        --with-fedora-copr)
+                fedora_copr=1
+                shift
+            ;;
+
         --with-fedora-review)
-            fedora_review=1
-            shift
-        ;;
+                fedora_review=1
+                shift
+            ;;
+
         *)
-            usage
-        ;;
+                usage
+            ;;
     esac
 done
 
-if  ! -d "arcanist.git" ; then
-    git clone -b stable https://github.com/phacility/arcanist.git arcanist.git
-    pushd arcanist.git
+if  ! -d "${package}.git" ; then
+    git clone -b stable https://github.com/phacility/${package}.git ${package}.git
+    pushd ${package}.git
 else
-    pushd arcanist.git
-    git remote set-url origin https://github.com/phacility/arcanist.git
+    pushd ${package}.git
+    git remote set-url origin https://github.com/phacility/${package}.git
     git fetch origin
     git reset --hard origin/stable
     git clean -d -f -x
 fi
 
+current_version=$(grep "%global git_full_version_hash" ../${package}.spec | awk '{print $3}')
+
 git_short_version_hash=$(git rev-parse --short HEAD)
 git_full_version_hash=$(git rev-parse HEAD)
 
@@ -40,35 +58,66 @@
 
 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
+if  ! -f ${package}-${git_full_version_hash}.tar.gz ; then
+    rm -rf ${package}-*.tar.gz
+    wget --content-disposition https://github.com/phacility/${package}/archive/${git_full_version_hash}.tar.gz#/${package}-${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/revision_date 0-9+$/revision_date ${commitdate}/g" \
-    -e "s/Requires:(\s+)arcanist$libphutil$ >= 0-9+/Requires:\1arcanist$libphutil$ >= ${month_behind}/g" \
-    -e "s/Requires:(\s+)arcanist$libphutil$ <= 0-9+/Requires:\1arcanist$libphutil$ <= ${month_ahead}/g" \
-    arcanist.spec
+    ${package}.spec
+
+if  "${package}" == "arcanist" ; then
+    sed -i -r \
+        -e "s/Requires:(\s+)arcanist$libphutil$ >= 0\.0-9+/Requires:\1arcanist$libphutil$ >= 0\.${month_behind}/g" \
+        -e "s/Requires:(\s+)arcanist$libphutil$ <= 0\.0-9+/Requires:\1arcanist$libphutil$ <= 0\.${month_ahead}/g" \
+        ${package}.spec
+
+elif  "${package}" == "phabricator" ; then
+    sed -i -r \
+        -e "s/Requires:(\s+)arcanist >= 0\.0-9+/Requires:\1arcanist >= 0\.${month_behind}/g" \
+        -e "s/Requires:(\s+)arcanist <= 0\.0-9+/Requires:\1arcanist <= 0\.${month_ahead}/g" \
+        -e "s/Requires:(\s+)phabricator$libphutil$ >= 0\.0-9+/Requires:\1phabricator$libphutil$ >= 0\.${month_behind}/g" \
+        -e "s/Requires:(\s+)phabricator$libphutil$ <= 0\.0-9+/Requires:\1phabricator$libphutil$ <= 0\.${month_ahead}/g" \
+        ${package}.spec
+fi
 
-rpmdev-bumpspec \
-    --new="${commitdate}.git${git_short_version_hash}" \
-    --comment "Promote Week #$(date +'%V %Y' --date ${commitdate})" \
-    arcanist.spec
+if  "${git_full_version_hash}" != "${current_version}" ; then
+    rpmdev-bumpspec \
+        --new="0.${commitdate}.git${git_short_version_hash}" \
+        --comment "Promote Week #$(date +'%V %Y' --date ${commitdate})" \
+        ${package}.spec
+else
+    rpmdev-bumpspec \
+        --comment "Rebuild" \
+        ${package}.spec
+fi
 
 # Thanks, rpmdev-bumpspec ...
 sed -i -r \
-    -e "s/^Version:(\s+).*$/Version:\1%{revision_date}.git%{git_short_version_hash}/g" \
-    arcanist.spec
+    -e "s/^Version:(\s+).*$/Version:\10.%{revision_date}.git%{git_short_version_hash}/g" \
+    ${package}.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 . && \
-    test ${fedora_review} -eq 1 && \
-    fedora-review --verbose -n arcanist
+if  -d .osc/ ; then
+    osc ar
+
+    osc build --no-verify CentOS_7 ${package}.spec && \
+        rm -rf review-${package}/ ${package}-*.src.rpm && \
+        cp /var/tmp/build-root/CentOS_7-x86_64/home/abuild/rpmbuild/SRPMS/${package}-*.src.rpm . || exit 1
+fi
+
+if  ${fedora_review} -eq 1 ; then
+    fedora-review --verbose -n ${package}
+fi
+
+if  ${fedora_copr} -eq 1 ; then
+    test -f ${package}-*.src.rpm || \
+        rpmbuild --define "_srcdir $(pwd)" --define "_sourcedir $(pwd)" -bs ${package}.spec
+
+    copr-cli build ${copr_wait_opt} phabricator *.src.rpm
+fi