From 14a6b3333af3212822736eb99d7c76aa3f87e89e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 22 Mar 2015 20:05:21 +0100 Subject: qelectrotech-0.50-0.1.svn3844 (Copr) --- mksrc.sh | 4 ++-- qelectrotech.spec | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mksrc.sh b/mksrc.sh index 649375e..cc89cde 100755 --- a/mksrc.sh +++ b/mksrc.sh @@ -5,7 +5,7 @@ if [ "$1" = "" ]; then exit 1 fi REV=$1 -VER=${2-0.4} +VER=${2-0.5} RPM=$(php -r "printf('%.2f', $VER);") svn export -r $REV svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-${VER}-svn${REV} @@ -21,6 +21,6 @@ rm -rf qelectrotech-${VER}-svn${REV} 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}-0.1.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 6f928e4..d402ace 100644 --- a/qelectrotech.spec +++ b/qelectrotech.spec @@ -6,9 +6,9 @@ # # Please, preserve the changelog entries # -#global svnrel 3658 +%global svnrel 3844 %global rdate 20150220 -%global upver 0.4 +%global upver 0.5 Name: qelectrotech @@ -29,9 +29,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.40 +Version: 0.50 %if 0%{?svnrel} -Release: 0.5.svn%{svnrel}%{?dist} +Release: 0.1.svn%{svnrel}%{?dist} %else Release: 1%{?dist} %endif @@ -51,7 +51,8 @@ Source0: http://download.tuxfamily.org/qet/tags/%{rdate}/qelectrotech-%{upver %endif BuildRequires: desktop-file-utils -BuildRequires: qt4-devel >= 4.8 +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtsvg-devel Requires: qelectrotech-symbols = %{version}-%{release} Requires: electronics-menu @@ -158,7 +159,7 @@ sed -e s,/usr/local/,%{_prefix}/, \ -e /QET_MIME/s,../,, \ -i %{name}.pro -qmake-qt4 %{name}.pro +qmake-qt5 %{name}.pro %build @@ -237,6 +238,10 @@ fi %changelog +* Sun Mar 22 2015 Remi Collet - 0.50-0.1.svn3844 +- Update to 0.5 snapshot revision 3844 +- swicth to Qt 5 + * Fri Feb 20 2015 Remi Collet - 0.40-1 - Version 0.4 finale -- cgit