albator
13 years ago
parent
cefaaec2e7
commit
3ab3e65898
@ -0,0 +1,10 @@
|
||||
--- 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}
|
||||
)
|
||||
@ -0,0 +1,22 @@
|
||||
--- 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
|
||||
@ -0,0 +1,33 @@
|
||||
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;
|
||||
@ -0,0 +1,130 @@
|
||||
# Default version for this component
|
||||
%define kdecomp knetworkmanager
|
||||
%if 0%{?fedora} >= 15
|
||||
%define version 0.9
|
||||
%else
|
||||
%define version 0.8
|
||||
%endif
|
||||
%define release 1
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%define _docdir %{_prefix}/share/doc
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
BuildRequires: cmake >= 2.8
|
||||
%define tde_docdir %{_docdir}/kde
|
||||
%define tde_libdir %{_libdir}/trinity
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Version: %{?version}
|
||||
Release: %{?release}%{?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: NetworkManager-gnome
|
||||
Requires: kde-filesystem
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
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="%{_bindir}:${PATH}"
|
||||
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
|
||||
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
|
||||
export LD_LIBRARY_PATH="%{_libdir}"
|
||||
|
||||
# Missing TDE macros
|
||||
%__mkdir_p cmake
|
||||
%__ln_s %{_datadir}/cmake cmake/modules
|
||||
|
||||
%__mkdir build
|
||||
cd build
|
||||
%cmake ..
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%__rm -rf $RPM_BUILD_ROOT
|
||||
%__make install DESTDIR=%{?buildroot} -C build
|
||||
|
||||
|
||||
%clean
|
||||
%__rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/knetworkmanager
|
||||
%{_libdir}/*.la
|
||||
%{_libdir}/*.so
|
||||
%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
|
||||
%{_datadir}/applications/kde/knetworkmanager.desktop
|
||||
%{_datadir}/apps/knetworkmanager
|
||||
%{_datadir}/icons/*/*/apps/knetworkmanager*
|
||||
%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
|
||||
%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/*.h
|
||||
%{tde_libdir}/*.la
|
||||
%{tde_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
|
||||
- Initial build
|
||||
Loading…
Reference in new issue