Kolab Groupware OBS

Changes of Revision 41

phabricator.spec Changed

@@ -1,11 +1,11 @@
-%define revision_date 20161126
-%define git_short_version_hash cfcc3b8
-%define git_full_version_hash cfcc3b834d1df721ca40ad436930ddde3cba430f
+%global revision_date 20161126
+%global git_short_version_hash cfcc3b8
+%global git_full_version_hash cfcc3b834d1df721ca40ad436930ddde3cba430f
 
 Summary:            An open software engineering platform
 Name:               phabricator
-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
 Group:              Applications/Productivity
 URL:                http://www.phabricator.org/
@@ -79,14 +79,14 @@
 Requires:           figlet
 Requires:           php-PHPMailer
 
-Requires:           arcanist >= 20161026
-Requires:           arcanist <= 20161227
+Requires:           arcanist >= 0.20161026
+Requires:           arcanist <= 0.20161227
 Requires:           git-core
 Requires:           httpd
 Requires:           nodejs
 Requires:           nodejs-ws
-Requires:           phabricator(libphutil) >= 20161026
-Requires:           phabricator(libphutil) <= 20161227
+Requires:           phabricator(libphutil) >= 0.20161026
+Requires:           phabricator(libphutil) <= 0.20161227
 Requires:           php-curl
 Requires:           php-iconv
 Requires:           php-pecl-mailparse
@@ -290,6 +290,15 @@
 %attr(0775, phabricator, phabricator) %{_var}/log/phabricator
 
 %changelog
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.gitcfcc3b8-3
+- Rebuild
+
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.gitcfcc3b8-2
+- Rebuild
+
+* Thu Dec 01 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.20161126.gitcfcc3b8-1
+- Rebuild
+
 * Tue Nov 29 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 20161126.gitcfcc3b8-1
 - Promote Week #47 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 "phabricator.git" ]; then
-    git clone -b stable https://github.com/phacility/phabricator.git phabricator.git
-    pushd phabricator.git
+if [ ! -d "${package}.git" ]; then
+    git clone -b stable https://github.com/phacility/${package}.git ${package}.git
+    pushd ${package}.git
 else
-    pushd phabricator.git
-    git remote set-url origin https://github.com/phacility/phabricator.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,37 +58,66 @@
 
 popd
 
-if [ ! -f phabricator-${git_full_version_hash}.tar.gz ]; then
-    rm -rf phabricator-*.tar.gz
-    wget --content-disposition https://github.com/phacility/phabricator/archive/${git_full_version_hash}.tar.gz#/phabricator-${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/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 >= [0-9]+/Requires:\1arcanist >= ${month_behind}/g" \
-    -e "s/Requires:(\s+)arcanist <= [0-9]+/Requires:\1arcanist <= ${month_ahead}/g" \
-    -e "s/Requires:(\s+)phabricator$libphutil$ >= [0-9]+/Requires:\1phabricator$libphutil$ >= ${month_behind}/g" \
-    -e "s/Requires:(\s+)phabricator$libphutil$ <= [0-9]+/Requires:\1phabricator$libphutil$ <= ${month_ahead}/g" \
-    phabricator.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})" \
-    phabricator.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" \
-    phabricator.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 phabricator.spec && \
-    rm -rf review-phabricator/ phabricator-*.src.rpm && \
-    cp /var/tmp/build-root/CentOS_7-x86_64/home/abuild/rpmbuild/SRPMS/phabricator-*.src.rpm . && \
-    test ${fedora_review} -eq 1 && \
-    fedora-review --verbose -n phabricator
+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