Attachment 292280 Details for Bug 284961 – pass qt paths to %configure

[patch] pass qt paths to %configure

serenity_qtpaths.diff (text/plain), 1.46 KB, created by Thomas Moschny on 2008-01-19 23:41:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Moschny

Created: 2008-01-19 23:41:31 UTC

Size: 1.46 KB

patch

obsolete

>#
>#
># patch "serenity.spec"
>#  from [a3894feffeb12084a15a90eeb2c8b61d94aa53a2]
>#    to [62a25572389179a6663765bedaffd61741497e72]
>#
>============================================================
>--- serenity.spec	a3894feffeb12084a15a90eeb2c8b61d94aa53a2
>+++ serenity.spec	62a25572389179a6663765bedaffd61741497e72
>@@ -1,6 +1,6 @@ Version:        1.7.1
> Name:           serenity
> Version:        1.7.1
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        KDE Style and Window Decoration
> Group:          User Interface/Desktops
> License:        GPLv2
>@@ -17,7 +17,11 @@ options to make the Serenity yours.
> %setup -q
> 
> %build
>-%configure --disable-rpath
>+%configure --disable-rpath \
>+           --with-qt-dir=%(pkg-config --variable=prefix qt-mt) \
>+           --with-qt-libraries=%(pkg-config --variable=libdir qt-mt) \
>+           --with-qt-includes=%(pkg-config --variable=includedir qt-mt)
>+
> # remove rpath
> sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
> sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
>@@ -55,6 +59,10 @@ rm -rf %{buildroot}
> %{_datadir}/apps/kdisplay/color-schemes/Serenity*.kcsrc
> 
> %changelog
>+* Fri Jan 18 2008 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.1-3
>+- Pass the qt location to configure, otherwise it doesn't build
>+  anymore.
>+
> * Thu Sep 13 2007 Thomas Moschny <thomas.moschny@gmx.de> - 1.7.1-2
> - Remove version from kdebase-devel build requirement.
> - Remove obsolete 'fixme' comment.

Actions: View | Diff

Attachments on bug 284961: 292280