Fixed spec-file and update-script to use the checkout-date and not the build-date in the rpm-revision.

master
Jens Lody 9 years ago
parent 0205d6810c
commit 5b0c8ce5bb
  1. 8
      gnome-shell-extension-panel-osd.spec
  2. 9
      update_revision.sh

@ -1,11 +1,12 @@
%global git 60eff04 %global git 0205d68
%global uuid panel-osd@berend.de.schouwer.gmail.com %global uuid panel-osd@berend.de.schouwer.gmail.com
%global github jenslody-gnome-shell-extension-panel-osd %global github jenslody-gnome-shell-extension-panel-osd
%global checkout git%{git} %global checkout git%{git}
%global checkout_date 20150918
Name: gnome-shell-extension-panel-osd Name: gnome-shell-extension-panel-osd
Version: 1 Version: 1
Release: 0.0.%(date +%Y%m%d)%{checkout}%{?dist} Release: 0.1.%{checkout_date}%{checkout}%{?dist}
Summary: Configure the place where notifications are shown Summary: Configure the place where notifications are shown
Group: User Interface/Desktops Group: User Interface/Desktops
@ -62,6 +63,9 @@ fi
%{_datadir}/gnome-shell/extensions/%{uuid} %{_datadir}/gnome-shell/extensions/%{uuid}
%changelog %changelog
* Thu Sep 17 2015 Jens Lody <fedora@jenslody.de> - 1-0.1.20150918git0205d68
- Use checkout-date instead of build-date in package-version.
* Thu Aug 20 2015 Jens Lody <fedora@jenslody.de> - 1-0.1.20150821gitcb1f6f6 * Thu Aug 20 2015 Jens Lody <fedora@jenslody.de> - 1-0.1.20150821gitcb1f6f6
- Remove dot before git in Release-tag. - Remove dot before git in Release-tag.
- Use (conditional) file-triggers for schema compiling, introduced in fc24. - Use (conditional) file-triggers for schema compiling, introduced in fc24.

@ -63,8 +63,13 @@ COMMIT=`git log -1 --pretty=format:"%h"`
echo "Found revision: '${COMMIT}'" echo "Found revision: '${COMMIT}'"
mv ${SPEC_FILE} ${SPEC_FILE}.tmp DATE=`date +%Y%m%d`
sed "1 s/%global git .*/%global git $COMMIT/" < ${SPEC_FILE}.tmp > ${SPEC_FILE}
echo "Use checkout-date: '${DATE}'"
cp ${SPEC_FILE} ${SPEC_FILE}.tmp
sed -i "s/%global git .*/%global git $COMMIT/" ${SPEC_FILE}
sed -i "s/%global checkout_date .*/%global checkout_date $DATE/" ${SPEC_FILE}
rpmdev-bumpspec --comment="Fresh git checkout." --userstring="Jens Lody <fedora@jenslody.de>" ${SPEC_FILE} rpmdev-bumpspec --comment="Fresh git checkout." --userstring="Jens Lody <fedora@jenslody.de>" ${SPEC_FILE}

Loading…
Cancel
Save