summaryrefslogtreecommitdiffstats
path: root/redhat/applications/wlassistant
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-01-30 14:34:02 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2021-01-30 22:29:41 +0100
commit6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch)
tree85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/applications/wlassistant
parent87e57a1a070839a44db16a0410ef57902db2df3e (diff)
downloadtde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz
tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip
RPM: massive update and cleanup
Diffstat (limited to 'redhat/applications/wlassistant')
-rw-r--r--redhat/applications/wlassistant/wlassistant-3.5.13.2.spec140
-rw-r--r--redhat/applications/wlassistant/wlassistant.spec (renamed from redhat/applications/wlassistant/wlassistant-14.0.0.spec)31
2 files changed, 15 insertions, 156 deletions
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
deleted file mode 100644
index 264a650c2..000000000
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# Default version for this component
-%define tde_pkg wlassistant
-%define tde_version 3.5.13.2
-
-# TDE 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-%{tde_pkg}
-Summary: User friendly TDE frontend for wireless network connection [Trinity]
-Version: 0.5.7
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://wlassistant.sourceforge.net/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-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: python
-BuildRequires: cmake >= 2.8
-
-%description
-Wireless Assistant scans for wireless access points and displays link quality,
-encryption and other useful information. When user wants to connect to a
-network, Wireless Assistant opens up its wizards and guides the user through
-Wi-Fi settings. After a successful connection is made the settings are
-remembered so next time the user won't have to enter them again.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-# Shitty hack for RHEL4 ...
-if [ -d "/usr/X11R6" ]; then
- export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
- %__mkdir_p build
- cd build
-fi
-
-%cmake \
- -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
- -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- \
- -DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
- -DLIB_INSTALL_DIR=%{tde_libdir} \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
- \
- -DBUILD_ALL=on \
- ..
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog VERSION
-%{tde_bindir}/wlassistant
-%{tde_tdeappdir}/wlassistant.desktop
-%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
-%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%changelog
diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant.spec
index fdd4e9b31..8fdb8da81 100644
--- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec
+++ b/redhat/applications/wlassistant/wlassistant.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg wlassistant
%define tde_prefix /opt/trinity
@@ -99,8 +99,18 @@ BuildRequires: libidn-devel
%define with_gamin 1
BuildRequires: gamin-devel
%endif
+
# PYTHON support
-BuildRequires: python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
# OPENSSL support
BuildRequires: openssl-devel
@@ -171,28 +181,17 @@ export PATH="%{tde_bindir}:${PATH}"
%suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network
%endif
+%find_lang %{tde_pkg}
+
%clean
%__rm -rf %{buildroot}
-%files
+%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc ChangeLog VERSION
%{tde_bindir}/wlassistant
%{tde_tdeappdir}/wlassistant.desktop
%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png
%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png
-%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo
-%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo
-%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo
-%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo
-%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo
-%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo
-%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo
-%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo
-%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo
-%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo
-
-
-%changelog