From 1a87dcb807f2dd1cb5eca087698efab80daa29c1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 10 Sep 2017 21:08:56 +0000 Subject: [PATCH] Fixed RPM spec file and build script. --- build.sh | 2 +- scripts/rpm-data/klayout.spec | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7912fb492..613cc5085 100755 --- a/build.sh +++ b/build.sh @@ -473,7 +473,7 @@ fi $QMAKE -v # Force a minimum rebuild because of version info -touch src/version/version.h +touch $CURR_DIR/src/version/version.h qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \ CONFIG+=$CONFIG \ diff --git a/scripts/rpm-data/klayout.spec b/scripts/rpm-data/klayout.spec index d36f3e5d0..f00b74d70 100644 --- a/scripts/rpm-data/klayout.spec +++ b/scripts/rpm-data/klayout.spec @@ -75,7 +75,12 @@ elif which qmake-qt5; then fi # TODO: remove -without-qtbinding +%if "%{git_source}" != "" +# build from git sources if possible +cd %{git_source} +%else cd %{_sourcedir} +%endif ./build.sh -rpath %{_libdir}/klayout \ -bin %{_builddir}/bin.$TARGET \ -build %{_builddir}/build.$TARGET \