diff options
Diffstat (limited to 'redhat/tdetoys')
| -rw-r--r-- | redhat/tdetoys/tdetoys-14.0.0.spec | 9 | ||||
| -rw-r--r-- | redhat/tdetoys/tdetoys-3.5.13.2.spec | 11 |
2 files changed, 10 insertions, 10 deletions
diff --git a/redhat/tdetoys/tdetoys-14.0.0.spec b/redhat/tdetoys/tdetoys-14.0.0.spec index 0144e23ce..e464773a5 100644 --- a/redhat/tdetoys/tdetoys-14.0.0.spec +++ b/redhat/tdetoys/tdetoys-14.0.0.spec @@ -384,12 +384,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ diff --git a/redhat/tdetoys/tdetoys-3.5.13.2.spec b/redhat/tdetoys/tdetoys-3.5.13.2.spec index 82895e0e0..aa31d8b07 100644 --- a/redhat/tdetoys/tdetoys-3.5.13.2.spec +++ b/redhat/tdetoys/tdetoys-3.5.13.2.spec @@ -382,7 +382,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %build -unset QTDIR || : ; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export KDEDIR=%{tde_prefix} @@ -391,10 +392,10 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ |