diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-07-24 11:25:02 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-07-24 11:25:02 +0200 |
| commit | 0c4b32438a57f52601dfe66d133bd263a5d304ee (patch) | |
| tree | 9389a6db04f282ab54a2cc4ca8f55124285a5fa4 /redhat/dependencies/tqt3/tqt3-14.0.0.spec | |
| parent | 700ec263535470631ef4f6fb816000500eb4227e (diff) | |
| download | tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.tar.gz tde-packaging-0c4b32438a57f52601dfe66d133bd263a5d304ee.zip | |
RPM Packaging: updates for R14
Diffstat (limited to 'redhat/dependencies/tqt3/tqt3-14.0.0.spec')
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0.spec | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index aa2813914..dcabb903f 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -26,8 +26,6 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch1: tqt3-14.0.0-shared_lib.patch # [tqt3] Fix FTBFS Patch2: tqt3-14.0.0-fix_ftbfs.patch -# [tqt3] Fix GLIB initialization -Patch3: tqt3-14.0.0-fix_glib_init.patch BuildRequires: desktop-file-utils BuildRequires: libmng-devel @@ -430,7 +428,15 @@ for the TQt 3 toolkit. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .sharedlibs %patch2 -p1 -b .ftbfs -%patch3 -p1 -b .glibinit + +# fix variables in 'qmake.conf' +%__sed -i mkspecs/*/qmake.conf \ + -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \ + -e "s|\$(QTDIR)|/usr|g" \ + -e "s|-lqt|-ltqt|g" \ + -e "s|^QMAKE_STRIP =.*|QMAKE_STRIP =|" \ + -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" + %build unset QTDIR QTINC QTLIB @@ -549,12 +555,6 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h # fix .prl files %__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g" -# fix QTDIR in 'qmake.conf' -%__sed -i mkspecs/*/qmake.conf \ - -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \ - -e "s|\$(QTDIR)|/usr|g" \ - -e "s|-lqt|-ltqt|g" - %install %__rm -rf %{buildroot} |