summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec3
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch35
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec4
3 files changed, 3 insertions, 39 deletions
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index e2711dd57..7a24c867a 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -34,6 +34,8 @@ URL: http://kaffeine.sourceforge.net/
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0: kaffeine-14.0.0-ftbfs.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@@ -222,6 +224,7 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch
deleted file mode 100644
index d9b98985f..000000000
--- a/redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./tools/assistant/lib/lib.pro.ori 2013-06-25 20:20:21.576374929 +0200
-+++ ./tools/assistant/lib/lib.pro 2013-06-25 20:20:36.008078008 +0200
-@@ -3,8 +3,7 @@
- VERSION = 1.0
-
- CONFIG += qt warn_on release
--CONFIG += staticlib
--CONFIG -= dll
-+CONFIG += dll
-
- SOURCES = qassistantclient.cpp
- HEADERS += $$QT_SOURCE_TREE/include/ntqassistantclient.h
---- ./tools/designer/editor/editor.pro.ori 2013-06-25 20:21:49.469566420 +0200
-+++ ./tools/designer/editor/editor.pro 2013-06-25 20:21:59.535359278 +0200
-@@ -1,6 +1,6 @@
- TEMPLATE = lib
--CONFIG += qt warn_on staticlib
--CONFIG -= dll
-+CONFIG += qt warn_on
-+CONFIG += dll
- HEADERS = editor.h \
- parenmatcher.h \
- completion.h \
---- ./tools/designer/designer/designer.pro.ori 2013-06-25 20:22:39.279541337 +0200
-+++ ./tools/designer/designer/designer.pro 2013-06-25 20:23:08.892943751 +0200
-@@ -1,7 +1,7 @@
- TEMPLATE = lib
-
--CONFIG += qt warn_on staticlib qmake_cache
--CONFIG -= dll
-+CONFIG += qt warn_on qmake_cache
-+CONFIG += dll
- !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
- CONFIG -= staticlib
- CONFIG += dll
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 53333ef3c..13ffbccf2 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -22,9 +22,6 @@ Prefix: %{tde_prefix}
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-# [tqt3] Build shared libraries
-Patch1: tqt3-14.0.0-shared_lib.patch
-
BuildRequires: desktop-file-utils
BuildRequires: libmng-devel
BuildRequires: glibc-devel
@@ -461,7 +458,6 @@ for the TQt 3 toolkit.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .sharedlibs
# fix variables in 'qmake.conf'
%__sed -i mkspecs/*/qmake.conf \