RPM: massive update and cleanup

4 files changed, 1 insertions, 212 deletions

diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch
deleted file mode 100644
index 175d299e7..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI	2011-11-11 15:06:49.854247242 -0500
-+++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt	2011-11-11 15:06:58.662060747 -0500
-@@ -18,6 +18,7 @@
-   ${CMAKE_BINARY_DIR}
-   ${TDE_INCLUDE_DIR}
-   ${TQT_INCLUDE_DIRS}
-+  ${DBUS_INCLUDE_DIRS}
-   ${DBUS_TQT_INCLUDE_DIRS}
-   ${NM_UTIL_INCLUDE_DIRS}
- )
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch
deleted file mode 100644
index 9db3ab5de..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- knetworkmanager9/CMakeLists.txt.ORI	2011-11-11 13:36:01.462536187 -0500
-+++ knetworkmanager9/CMakeLists.txt	2011-11-11 13:36:10.762446937 -0500
-@@ -63,7 +63,7 @@
- 
- ##### source directories ########################
- 
--add_subdirectory( knetworkmanager-0.8 )
-+add_subdirectory( knetworkmanager-0.9 )
- 
- 
- ##### write configure files #####################
---- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI	2011-11-11 13:39:32.866229477 -0500
-+++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt	2011-11-11 13:39:48.169042904 -0500
-@@ -18,7 +18,7 @@
- 
- ##### knm_dbus (static) #########################
- 
--set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" )
-+set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" )
- 
- # options:
- #  p - generate proxy files
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
deleted file mode 100644
index 0ada2aed4..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
+++ /dev/null
@@ -1,179 +0,0 @@
-# Default version for this component
-%define tde_pkg knetworkmanager8
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name:			trinity-%{tde_pkg}
-Version:		0.8
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-Summary:		Trinity applet for Network Manager
-
-Group:			Applications/Internet
-License:		GPLv2+
-URL:			http://en.opensuse.org/Projects/KNetworkManager
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch0:			knetworkmanager-3.5.13-missing_includes.patch
-
-# For knetworkmanager 0.9 only !
-Patch10:		knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	desktop-file-utils
-
-# NETWORKMANAGER support
-%if 0%{?rhel} || 0%{?fedora}
-Requires:		NetworkManager-gnome
-%endif
-%if 0%{?mdkversion} || 0%{?mgaversion}
-Requires:		networkmanager
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:	NetworkManager-glib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	NetworkManager-devel
-Requires:		NetworkManager
-%endif
-
-BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
-
-Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
-Provides:		trinity-knetworkmanager = %{version}-%{release}
-
-%description
-KNetworkManager is a system tray applet for controlling network
-connections on systems that use the NetworkManager daemon.
-
-
-%package devel
-Summary:		Common data shared among the MySQL GUI Suites
-Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
-
-Obsoletes:		trinity-knetworkmanager-devel < %{version}-%{release}
-Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep 
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
-  %__mkdir_p build
-  cd build
-fi
-
-%cmake \
-  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-  -DCMAKE_SKIP_RPATH=OFF \
-  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  -DCMAKE_VERBOSE_MAKEFILE=ON \
-  \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  ..
-  
-%__make %{?_smp_mflags} 
-
-%install
-%__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=%{?buildroot} -C build
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-
-%post
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%postun
-update-desktop-database %{tde_appdir} > /dev/null
-/sbin/ldconfig
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%post devel
-/sbin/ldconfig
-
-
-%postun devel
-/sbin/ldconfig
-
-
-%files 
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
-%{tde_tdeappdir}/knetworkmanager.desktop
-%{tde_datadir}/apps/knetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
-%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
-
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
-%changelog
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
index f1434e905..334a82076 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg knetworkmanager
 %define tde_prefix /opt/trinity