diff options
Diffstat (limited to 'redhat/main/tdelibs')
-rw-r--r-- | redhat/main/tdelibs/tdelibs-14.0.1.patch | 31 | ||||
-rw-r--r-- | redhat/main/tdelibs/tdelibs-14.1.0.patch | 13 | ||||
-rw-r--r-- | redhat/main/tdelibs/tdelibs.spec | 7 |
3 files changed, 1 insertions, 50 deletions
diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch deleted file mode 100644 index ab309f841..000000000 --- a/redhat/main/tdelibs/tdelibs-14.0.1.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h -index b5fddb8..1269c36 100644 ---- a/tdecore/tdeglobal.h -+++ b/tdecore/tdeglobal.h -@@ -25,8 +25,10 @@ class KCharsets; - class TDEConfig; - class TDESharedConfig; - class TDEIconLoader; -+#ifdef __TDE_HAVE_TDEHWLIB - class TDEHardwareDevices; - class TDEGlobalNetworkManager; -+#endif - class TDELocale; - class TDEStandardDirs; - class KStaticDeleterBase; -@@ -79,6 +81,7 @@ public: - */ - static TDEIconLoader *iconLoader(); - -+#ifdef __TDE_HAVE_TDEHWLIB - /** - * Returns a TDEHardwareDevices object. - * @return the global hardware devices object -@@ -90,6 +93,7 @@ public: - * @return the global network manager object - */ - static TDEGlobalNetworkManager *networkManager(); -+#endif - - /** - * Returns the global locale object. diff --git a/redhat/main/tdelibs/tdelibs-14.1.0.patch b/redhat/main/tdelibs/tdelibs-14.1.0.patch deleted file mode 100644 index c4812b447..000000000 --- a/redhat/main/tdelibs/tdelibs-14.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -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} - ) diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 0afe618fe..f38c171de 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.0.7 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -60,9 +60,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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} Obsoletes: trinity-kdelibs < %{version}-%{release} @@ -622,8 +619,6 @@ 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 |