diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:20:03 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:20:03 +0100 |
| commit | 90a360553626ac757a29708ba76c764b1b7b900c (patch) | |
| tree | 92bc276e9ec5e15e41da7ed4c752d4d3d5c44c2c /redhat | |
| parent | f6243173ae57c3dca99ea2f7fd6af0a837c8c6bb (diff) | |
| parent | a2030eb3a57cde9db1ab019f4c135e229b8b332e (diff) | |
| download | tde-packaging-90a360553626ac757a29708ba76c764b1b7b900c.tar.gz tde-packaging-90a360553626ac757a29708ba76c764b1b7b900c.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/applications/kaffeine/kaffeine-14.0.0.spec | 3 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch | 35 |
2 files changed, 3 insertions, 35 deletions
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec index f99abde78..078caea0d 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} @@ -228,6 +230,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 |