From 5015ab2e0b8fe6d6e719a7d2cbe172e60291d098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sun, 2 Feb 2014 21:53:14 +0100
Subject: RPM Packaging: update TQT3

---
 .../dependencies/tqt3/tqt3-14.0.0-shared_lib.patch | 35 ----------------------
 redhat/dependencies/tqt3/tqt3-14.0.0.spec          |  4 ---
 2 files changed, 39 deletions(-)
 delete mode 100644 redhat/dependencies/tqt3/tqt3-14.0.0-shared_lib.patch

(limited to 'redhat')

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 \
-- 
cgit v1.2.3