summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.0.spec2
-rw-r--r--redhat/main/tdelibs/tdelibs-14.1.0.patch13
2 files changed, 15 insertions, 0 deletions
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index cfa5db46d..b104842d2 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -61,6 +61,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: %{name}-rpmlintrc
Patch0: tdelibs-14.0.1.patch
+Patch1: tdelibs-14.1.0.patch
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
@@ -604,6 +605,7 @@ applications for TDE.
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
+%patch1 -p1 -b .ftbfs
# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
%if 0%{?rhel} == 5
diff --git a/redhat/main/tdelibs/tdelibs-14.1.0.patch b/redhat/main/tdelibs/tdelibs-14.1.0.patch
new file mode 100644
index 000000000..c4812b447
--- /dev/null
+++ b/redhat/main/tdelibs/tdelibs-14.1.0.patch
@@ -0,0 +1,13 @@
+diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
+index 4d9c4a4..fed951b 100644
+--- a/tdecore/CMakeLists.txt
++++ b/tdecore/CMakeLists.txt
+@@ -137,7 +137,7 @@ tde_add_library( ${target} SHARED AUTOMOC
+ EMBED tdecorenetwork-static ${TDEHW_LIB}
+ LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
+ ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
+- ${LIBBFD_LIBRARIES} ${LIB_UTIL}
++ ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${SSL_LIBRARIES}
+ DEPENDENCIES dcopidl dcopidl2cpp
+ DESTINATION ${LIB_INSTALL_DIR}
+ )