RPM Packaging: update lots of applications

2 files changed, 33 insertions, 30 deletions

diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
index ef8d9e323..aec76bc3f 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
@@ -173,17 +173,17 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdelibdir}/*.so
 
 %changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - %{?version}-5
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-5
 - Initial release for TDE 3.5.13.2
 
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4
 - Initial release for TDE 3.5.13.1
 
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
+* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
 - Rebuild for Fedora 17
 
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
+* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2
 - Remove faulty patch for WPA authentication
 
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
+* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
 - Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 2d3a653b3..4c47066f7 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -49,8 +49,8 @@ Requires:		NetworkManager-gnome
 Requires:		networkmanager
 %endif
 
-BuildRequires:	trinity-dbus-1-tqt-devel
-BuildRequires:	trinity-dbus-tqt-devel
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 BuildRequires:	NetworkManager-glib-devel
 
 Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
@@ -81,35 +81,38 @@ Development headers for knetworkmanager
 %prep 
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-cd knetworkmanager-0.*/src
-%patch0 -p3
+%__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"
+%__make -f "admin/Makefile.common"
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+# Warning: --enable-final causes FTBFS
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-new-ldflags \
+  --disable-final \
+  --enable-closure \
+  --enable-rpath \
+  --disable-gcc-hidden-visibility \
+  \
+  --with-openvpn \
+  --with-vpnc \
+  --with-pptp
 
-# Missing TDE macros
-%__mkdir_p cmake
-%__ln_s %{tde_datadir}/cmake cmake/modules
-
-%if 0%{?rhel} || 0%{?fedora}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -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} \
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-  
 %__make %{?_smp_mflags} || %__make