summaryrefslogtreecommitdiffstats
path: root/redhat/applications/knetworkmanager8
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-17 12:23:34 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-17 12:23:34 +0200
commit17e804faf6d943909d4285bf7e1fe743151b63b2 (patch)
tree63426313655992184b9b5ac9a7a658fd120b19d3 /redhat/applications/knetworkmanager8
parent4cc9430e31860d6bf23b62a15f0df2a199ea63a6 (diff)
downloadtde-packaging-17e804faf6d943909d4285bf7e1fe743151b63b2.tar.gz
tde-packaging-17e804faf6d943909d4285bf7e1fe743151b63b2.zip
RPM packaging: update knetload, knetstats, knetworkmanager, knights, kmap, knowit
Diffstat (limited to 'redhat/applications/knetworkmanager8')
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch33
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec186
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec180
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec156
4 files changed, 84 insertions, 471 deletions
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
deleted file mode 100644
index ad10145cf..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-wpa_passphrase_lag.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
---- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp 2011-11-11 20:45:47.964680619 +0100
-+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2011-11-11 20:51:32.689072955 +0100
-@@ -432,14 +432,15 @@
- , _wireless_setting(wireless_setting)
- {
- txtPSK->setText(_security_setting->getPSK());
-- connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&)));
-+ connect(txtPSK, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotPSKChanged()));
- }
-
- void
--WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk)
-+WirelessSecurityWPAPSKImpl::slotPSKChanged()
- {
- if (_wireless_setting)
- {
-+ TQString psk = txtPSK->text();
- _security_setting->setPSK(psk);
- }
- }
-diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h
---- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h 2011-11-11 20:45:47.962680657 +0100
-+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h 2011-11-11 20:46:21.640030856 +0100
-@@ -145,7 +145,7 @@
- TQCString String2Hex(TQByteArray bytes, int final_len) const;
-
- public slots:
-- void slotPSKChanged(const TQString&);
-+ void slotPSKChanged();
-
- private:
- WirelessSecurity* _security_setting;
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
deleted file mode 100644
index 38e901008..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-# Default version for this component
-%define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 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-%{kdecomp}
-Version: %{?version}
-Release: 4%{?dist}%{?_variant}
-
-Summary: Trinity applet for Network Manager
-
-Group: Applications/Internet
-License: GPLv2+
-URL: http://en.opensuse.org/Projects/KNetworkManager
-
-%if "%{?version}" == "0.9"
-Source0: %{kdecomp}9-3.5.13.tar.gz
-%else
-Source0: %{kdecomp}8-3.5.13.tar.gz
-%endif
-
-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)
-
-#Requires: kde-filesystem
-BuildRequires: desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires: NetworkManager-gnome
-%else
-Requires: networkmanager
-%endif
-
-BuildRequires: dbus-1-tqt-devel
-BuildRequires: dbus-tqt-devel
-BuildRequires: NetworkManager-glib-devel
-
-%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}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%if "%{?version}" == "0.9"
-%setup -q -n %{kdecomp}-3.5.13.19
-%else
-%setup -q -n applications/knetworkmanager8
-%endif
-
-%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"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# 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}
-
-%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
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-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
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
deleted file mode 100644
index b51395370..000000000
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
+++ /dev/null
@@ -1,180 +0,0 @@
-# Default version for this component
-%define kdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 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}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_tdedocdir}
-
-
-Name: trinity-%{kdecomp}
-Version: %{?version}
-Release: 3%{?dist}%{?_variant}
-
-Summary: Trinity applet for Network Manager
-
-Group: Applications/Internet
-License: GPLv2+
-URL: http://en.opensuse.org/Projects/KNetworkManager
-
-%if "%{?version}" == "0.9"
-Source0: %{kdecomp}9-3.5.13.tar.gz
-%else
-Source0: %{kdecomp}8-3.5.13.tar.gz
-%endif
-
-Patch0: knetworkmanager-3.5.13-missing_includes.patch
-Patch1: knetworkmanager-3.5.13-wpa_passphrase_lag.patch
-
-# For knetworkmanager 0.9 only !
-Patch10: knetworkmanager-3.5.13-subdir_version.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Requires: kde-filesystem
-BuildRequires: desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora}
-Requires: NetworkManager-gnome
-%else
-Requires: networkmanager
-%endif
-
-BuildRequires: dbus-1-tqt-devel
-BuildRequires: dbus-tqt-devel
-BuildRequires: NetworkManager-glib-devel
-
-%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}
-
-%description devel
-Development headers for knetworkmanager
-
-
-%prep
-%if "%{?version}" == "0.9"
-%setup -q -n applications/%{kdecomp}9
-%else
-%setup -q -n applications/%{kdecomp}8
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
-
-cd knetworkmanager-0.*/src
-%patch0 -p3
-#patch1 -p3
-
-
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# 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}
-
-%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
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
-- Rebuild for Fedora 17
-
-* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
-- Remove faulty patch for WPA authentication
-
-* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 7571533b4..12ea8e41c 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -15,10 +15,6 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
-# BUILD WARNING:
-# Remove qt-devel and qt3-devel and any kde*-devel on your system !
-# Having KDE libraries may cause FTBFS here !
-
# TDE variables
%define tde_epoch 2
%define tde_version 14.0.0
@@ -29,25 +25,20 @@
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_prefix}/man
+%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-Name: trinity-%{tde_pkg}8
-Epoch: %{tde_epoch}
-Version: 0.8
-Summary: Trinity applet for Network Manager
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-Group: Applications/Internet
-URL: http://www.trinitydesktop.org/
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.8
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Trinity applet for Network Manager
+Group: Applications/Internet
+URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
@@ -55,27 +46,47 @@ License: GPL-2.0+
License: GPLv2+
%endif
-#Vendor: Trinity Project
+#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source0: %{name}8-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-#Requires: kde-filesystem
+BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
%if 0%{?rhel} || 0%{?fedora}
Requires: NetworkManager-gnome
%else
Requires: networkmanager
%endif
-BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
-BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
+# NetworkManager support
BuildRequires: NetworkManager-glib-devel
+# HAL support
+BuildRequires: hal-devel
+
Obsoletes: trinity-knetworkmanager < %{version}-%{release}
Provides: trinity-knetworkmanager = %{version}-%{release}
@@ -83,6 +94,38 @@ Provides: trinity-knetworkmanager = %{version}-%{release}
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
+%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 || :
+
+%files -f knetworkmanager.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/knetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
+%{tde_tdelibdir}/knetworkmanager_pptp.so.*
+%{tde_tdelibdir}/knetworkmanager_vpnc.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
+%{tde_datadir}/services/knetworkmanager_openvpn.desktop
+%{tde_datadir}/services/knetworkmanager_pptp.desktop
+%{tde_datadir}/services/knetworkmanager_vpnc.desktop
+
+##########
%package devel
Summary: Common data shared among the MySQL GUI Suites
@@ -95,14 +138,29 @@ Provides: trinity-knetworkmanager-devel = %{version}-%{release}
%description devel
Development headers for knetworkmanager
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
+
+##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
+##########
+
%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}8-%{tde_version}%{?preversion:~%{preversion}}
%__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"
@@ -149,52 +207,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__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 -f knetworkmanager.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/knetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{tde_tdelibdir}/knetworkmanager_openvpn.so.*
-%{tde_tdelibdir}/knetworkmanager_pptp.so.*
-%{tde_tdelibdir}/knetworkmanager_vpnc.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
-%{tde_datadir}/services/knetworkmanager_openvpn.desktop
-%{tde_datadir}/services/knetworkmanager_pptp.desktop
-%{tde_datadir}/services/knetworkmanager_vpnc.desktop
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_tdelibdir}/*.la
-%{tde_tdelibdir}/*.so
-
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.8-1
- Initial release for TDE 14.0.0