summaryrefslogtreecommitdiffstats
path: root/redhat/applications/tdenetworkmanager
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
commita615d19df88eb2e989316b480519161945dbc7dc (patch)
tree369970b98042998b86c11024598155e037b76fec /redhat/applications/tdenetworkmanager
parent76a93e0011ade1583a1ec672f33411dfd35454f3 (diff)
downloadtde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz
tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/applications/tdenetworkmanager')
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec202
-rw-r--r--redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc1
2 files changed, 125 insertions, 78 deletions
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 5df794508..02cd9c010 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -1,52 +1,81 @@
-# Default version for this component
-%define tde_pkg tdenetworkmanager
+#
+# spec file for package tdenetworkmanager (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
-
-# 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 specific building variables
+%define tde_pkg tdenetworkmanager
+%define tde_prefix /opt/trinity
%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}/tde
+%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
-%define _docdir %{tde_tdedocdir}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.9
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: Trinity applet for Network Manager
+Group: Applications/Internet
+URL: http://www.trinitydesktop.org/
-Name: trinity-%{tde_pkg}
-Version: 0.9
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Summary: Trinity applet for Network Manager
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Group: Applications/Internet
-License: GPLv2+
-#URL: http://en.opensuse.org/Projects/KNetworkManager
-URL: http://www.trinitydesktop.org/
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1: %{name}-rpmlintrc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-
BuildRequires: gettext
+BuildRequires: cmake libtool
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# 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
Obsoletes: trinity-knetworkmanager < %{version}-%{release}
Provides: trinity-knetworkmanager = %{version}-%{release}
@@ -64,21 +93,75 @@ Requires: NetworkManager-gnome
Requires: networkmanager
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos} == 0
BuildRequires: NetworkManager-glib-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: NetworkManager-devel
Requires: NetworkManager
%endif
+# ACL support
+BuildRequires: libacl-devel
+
# DBUS support
BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
+# ACL support
+BuildRequires: libacl-devel
+
+# UDEV support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+BuildRequires: libudev-devel
+%endif
+
+# IDN support
+BuildRequires: libidn-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+
%description
TDENetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
+%post
+# Prevent autostart of 'nm-applet', if installed.
+if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
+ if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
+ sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
+ fi
+fi
+
+%files
+%defattr(-,root,root,-)
+%{tde_bindir}/tdenetworkmanager
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf
+%{tde_tdeappdir}/tdenetworkmanager.desktop
+%{tde_datadir}/apps/tdenetworkmanager
+%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager*
+%{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
+%{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
+%{tde_datadir}/autostart/tdenetworkmanager.desktop
+%{tde_datadir}/services/tdenetman_openvpn.desktop
+%{tde_datadir}/services/tdenetman_pptp.desktop
+%{tde_datadir}/services/tdenetman_strongswan.desktop
+%{tde_datadir}/services/tdenetman_vpnc.desktop
+%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
+
+##########
%package devel
Summary: Common data shared among the MySQL GUI Suites
@@ -88,13 +171,22 @@ Requires: %{name} = %{version}-%{release}
%description devel
Development headers for tdenetworkmanager
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/*.h
+%{tde_tdelibdir}/*.la
+%{tde_tdelibdir}/*.so
+
+##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
+##########
+
-%prep
+%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -131,60 +223,14 @@ fi
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=%{?buildroot} -C build
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet
+%endif
+
%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 || :
-# Prevent autostart of 'nm-applet', if installed.
-if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
- if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
- sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
- fi
-fi
-
-%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}/tdenetworkmanager
-%{tde_libdir}/*.la
-%{tde_libdir}/*.so
-%{_sysconfdir}/dbus-1/system.d/tdenetworkmanager.conf
-%{tde_tdeappdir}/tdenetworkmanager.desktop
-%{tde_datadir}/apps/tdenetworkmanager
-%{tde_datadir}/icons/hicolor/*/apps/tdenetworkmanager*
-%{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop
-%{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop
-%{tde_datadir}/autostart/tdenetworkmanager.desktop
-%{tde_datadir}/services/tdenetman_openvpn.desktop
-%{tde_datadir}/services/tdenetman_pptp.desktop
-%{tde_datadir}/services/tdenetman_strongswan.desktop
-%{tde_datadir}/services/tdenetman_vpnc.desktop
-%{tde_tdedocdir}/HTML/en/tdenetworkmanager/
-
-%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.9-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc b/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
new file mode 100644
index 000000000..8668d5e81
--- /dev/null
+++ b/redhat/applications/tdenetworkmanager/trinity-tdenetworkmanager-rpmlintrc
@@ -0,0 +1 @@
+setBadness('suse-dbus-unauthorized-service', 0)