summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-03-18 18:39:12 +0100
committerRemi Collet <fedora@famillecollet.com>2016-03-18 18:39:12 +0100
commit8eb5d65ee703cdcb23061feef40ddf0c34e38e9b (patch)
treeca5d5094505b6902b47d26d84843ae2c0ec29817
parent5b58b7247761d068e2734efaeccf198a4fd62ae9 (diff)
qelectrotech: fix F24 build
-rwxr-xr-xmksrc.sh2
-rw-r--r--qelectrotech.spec9
2 files changed, 6 insertions, 5 deletions
diff --git a/mksrc.sh b/mksrc.sh
index 88cdc8e..0ab80dc 100755
--- a/mksrc.sh
+++ b/mksrc.sh
@@ -21,6 +21,6 @@ rm -rf qelectrotech-${VER}-svn${REV}
vendor="Remi Collet <remi@fedoraproject.org>"
rpmdate=$(LC_ALL="C" date +"%a %b %d %Y")
-sed -e "s/%changelog/%changelog\n* $rpmdate $vendor - ${RPM}-0.1.svn${REV}\n- Update to ${VER} snapshot revision ${REV}\n/" \
+sed -e "s/%changelog/%changelog\n* $rpmdate $vendor - ${RPM}-0.5.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 efdeca7..632904b 100644
--- a/qelectrotech.spec
+++ b/qelectrotech.spec
@@ -33,7 +33,7 @@ Summary(ru): Редактор электрических схем
# Remember to check rdate and upver macro on each update
Version: 0.51
%if 0%{?svnrel}
-Release: 0.4.svn%{svnrel}%{?dist}
+Release: 0.5.svn%{svnrel}%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -179,7 +179,7 @@ sed -e s,/usr/local/,%{_prefix}/, \
-e /QET_MIME/s,../,, \
-i %{name}.pro
-qmake-qt5 \
+%{qmake_qt5} \
'QMAKE_COPY_DIR = cp -f -r --preserve=timestamps' \
qelectrotech.pro
@@ -260,10 +260,11 @@ fi
%changelog
-* Fri Mar 18 2016 Remi Collet <remi@fedoraproject.org> - 0.51-0.1.svn4383
+* Fri Mar 18 2016 Remi Collet <remi@fedoraproject.org> - 0.51-0.5.svn4383
- Update to 0.51 snapshot revision 4383
+- use %%{qmake_qt5} macro to ensure proper build flags
-* Tue Dec 29 2015 Remi Collet <remi@fedoraproject.org> - 0.51-0.1.svn4292
+* Tue Dec 29 2015 Remi Collet <remi@fedoraproject.org> - 0.51-0.4.svn4292
- Update to 0.51 snapshot revision 4292
* Fri Nov 27 2015 Remi Collet <remi@fedoraproject.org> - 0.50-1