From 9bf9667a1a93e1e500ab071b411daa3b1afcfb96 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Apr 2017 11:14:48 +0200 Subject: v0.6rc1 --- .gitignore | 7 +++++++ mksrc.sh | 9 +++++---- qelectrotech.spec | 13 ++++++++----- 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/mksrc.sh b/mksrc.sh index 0ab80dc..7c8ae5c 100755 --- a/mksrc.sh +++ b/mksrc.sh @@ -5,10 +5,11 @@ if [ "$1" = "" ]; then exit 1 fi REV=$1 -VER=${2-0.51} +VER=${2-0.6} +PRE=rc1 RPM=$(php -r "printf('%.2f', $VER);") -svn export -r $REV svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-${VER}-svn${REV} +svn export -r $REV svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-${VER}${PRE}-svn${REV} sed -e "/displayedVersion/s/\"[^\"]*\"/\"${VER}-dev (Revision ${REV})\"/" \ -i qelectrotech-${VER}-svn${REV}/sources/qet.h @@ -18,9 +19,9 @@ grep 'displayedVersion' qelectrotech-${VER}-svn${REV}/sources/qet.h tar czf qelectrotech-${VER}-svn${REV}.tgz qelectrotech-${VER}-svn${REV} rm -rf qelectrotech-${VER}-svn${REV} -vendor="Remi Collet " +vendor="Remi Collet " rpmdate=$(LC_ALL="C" date +"%a %b %d %Y") -sed -e "s/%changelog/%changelog\n* $rpmdate $vendor - ${RPM}-0.5.svn${REV}\n- Update to ${VER} snapshot revision ${REV}\n/" \ +sed -e "s/%changelog/%changelog\n* $rpmdate $vendor - ${RPM}-2.svn${REV}\n- Update to ${VER} snapshot revision ${REV}\n/" \ -e "/global svnrel/s/svnrel.*/svnrel $1/" \ -i *spec diff --git a/qelectrotech.spec b/qelectrotech.spec index 2694730..d00a891 100644 --- a/qelectrotech.spec +++ b/qelectrotech.spec @@ -6,9 +6,9 @@ # # Please, preserve the changelog entries # -%global svnrel 4440 -%global rdate 20151127 -%global upver 0.51 +#global svnrel 4947 +%global rdate 20170423 +%global upver 0.6rc1 Name: qelectrotech @@ -31,9 +31,9 @@ Summary(ru): Редактор электрических схем # Upstream version is a float so 0.11 < 0.2 < 0.21 < 0.3 # So use %.2f with upstream acknowledgment # Remember to check rdate and upver macro on each update -Version: 0.51 +Version: 0.60~rc1 %if 0%{?svnrel} -Release: 0.5.svn%{svnrel}%{?dist} +Release: 2.svn%{svnrel}%{?dist} %else Release: 1%{?dist} %endif @@ -260,6 +260,9 @@ fi %changelog +* Tue Apr 25 2017 Remi Collet - 0.60~rc1-1 +- Update to 0.6rc1 + * Sat Apr 16 2016 Remi Collet - 0.51-0.5.svn4440 - Update to 0.51 snapshot revision 4440 -- cgit