From 3ab3e65898ddc99639165ba2065c92aa9aa49ae1 Mon Sep 17 00:00:00 2001 From: albator Date: Fri, 11 Nov 2011 21:26:44 +0100 Subject: RHEL/Fedora: add knetworkmanager (+dbus-1-tqt) --- .../knetworkmanager/trinity-knetworkmanager.spec | 130 +++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 redhat/applications/knetworkmanager/trinity-knetworkmanager.spec (limited to 'redhat/applications/knetworkmanager/trinity-knetworkmanager.spec') diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec new file mode 100644 index 000000000..9173e163c --- /dev/null +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -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 - 0.8-1 +- Initial build -- cgit v1.2.1 From ba0a15d74e98b4cb42279dcda25e1730197a003e Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 12 Nov 2011 17:24:02 +0100 Subject: RHEL/Fedora: better integration with distribution, small fixes --- .../knetworkmanager/trinity-knetworkmanager.spec | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'redhat/applications/knetworkmanager/trinity-knetworkmanager.spec') diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec index 9173e163c..b561200b4 100644 --- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -106,6 +106,22 @@ cd build %__rm -rf $RPM_BUILD_ROOT +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + %files %defattr(-,root,root,-) %{_bindir}/knetworkmanager -- cgit v1.2.1 From 4f5750cbaf62281fd04eee8511756758d037f7f6 Mon Sep 17 00:00:00 2001 From: albator Date: Mon, 14 Nov 2011 19:51:48 +0100 Subject: RHEL/Fedora: fixes --- redhat/applications/knetworkmanager/trinity-knetworkmanager.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'redhat/applications/knetworkmanager/trinity-knetworkmanager.spec') diff --git a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec index b561200b4..1c45101ff 100644 --- a/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec +++ b/redhat/applications/knetworkmanager/trinity-knetworkmanager.spec @@ -5,7 +5,7 @@ %else %define version 0.8 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -77,7 +77,7 @@ Development headers for knetworkmanager cd knetworkmanager-0.*/src %patch0 -p3 -%patch1 -p3 +#patch1 -p3 @@ -142,5 +142,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{tde_libdir}/*.so %changelog -* Tue Nov 11 2011 Francois Andriot - 0.8-1 +* Sat Nov 13 2011 Francois Andriot - 0.8-2 / 0.9-2 +- Remove faulty patch for WPA authentication + +* Tue Nov 11 2011 Francois Andriot - 0.8-1 / 0.9-1 - Initial build -- cgit v1.2.1