430c4878 | 2014-12-22 03:26:41 | François Andriot |
RPM packaging: updates |
||
A redhat/main/tdebase/pamd.kcheckpass-trinity.pclos A redhat/main/tdebase/pamd.kdm-trinity-np.pclos A redhat/main/tdebase/pamd.kdm-trinity.pclos A redhat/main/tdebase/pamd.kscreensaver-trinity.pclos A redhat/packages.pclos M redhat/Makefile.r14 M redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec M redhat/applications/kpilot/kpilot-14.0.0.spec M redhat/applications/wlassistant/wlassistant-14.0.0.spec M redhat/applications/yakuake/yakuake-14.0.0.spec M redhat/build/build_rpm_package.sh M redhat/build/configure_repository.sh M redhat/build/rpmdist.sh M redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec M redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec M redhat/main/tdeadmin/tdeadmin-14.0.0.spec M redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec M redhat/main/tdeartwork/tdeartwork-14.0.0.spec M redhat/main/tdebase/tdebase-14.0.0.spec M redhat/main/tdelibs/tdelibs-14.0.0.spec M redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec M redhat/main/tdevelop/tdevelop-14.0.0.spec M redhat/packages.el6 M redhat/packages.el7 M redhat/packages.mga4 M redhat/packages.oss132 R redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 R redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 R redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 R redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 R redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 R redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 R redhat/main/tdebase/pamd.kdm-trinity.pclos2012 R redhat/main/tdebase/pamd.kdm-trinity.pclos2013 R redhat/main/tdebase/pamd.kdm-trinity.pclos2014 R redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 R redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 R redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 30501a3..ea91790 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -187,12 +187,6 @@ $(call buildpkg,3rdparty/curl) endif -libotr3: -# Build on Mageia, CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/libotr3) -endif - libtool: autoconf automake # Build on CentOS 5 only ifneq ($(wildcard /boot/vmlinuz*.el5*),) @@ -239,7 +233,10 @@ endif torsocks: +# Do NOT build on RHEL 7 +ifeq ($(wildcard /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/torsocks) +endif wv2: # Do NOT build on Mageia or openSUSE or PCLINUXOS @@ -480,7 +477,7 @@ konversation: tdebase $(call buildpkg,applications/konversation) -kopete-otr: tdebase libotr3 +kopete-otr: tdebase $(call buildpkg,applications/kopete-otr) kpicosim: tdebase diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec index 4c47066..bd9237d 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec @@ -1,44 +1,67 @@ -# Default version for this component -%define tde_pkg knetworkmanager8 +# +# spec file for package knetworkmanager8 (version R14.0.0) +# +# 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/ +# + +# 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 +%define tde_pkg knetworkmanager +%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_prefix}/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 -# 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}/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} +Name: trinity-%{tde_pkg}8 +Epoch: %{tde_epoch} Version: 0.8 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - Summary: Trinity applet for Network Manager - +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} Group: Applications/Internet -License: GPLv2+ -URL: http://en.opensuse.org/Projects/KNetworkManager +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Project +#Packager: Francois Andriot <francois.andriot@...> + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: knetworkmanager-3.5.13-missing_includes.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Requires: kde-filesystem BuildRequires: desktop-file-utils @@ -73,7 +96,7 @@ Development headers for knetworkmanager -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -89,7 +112,6 @@ %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" # Warning: --enable-final causes FTBFS %configure \ @@ -113,12 +135,14 @@ --with-vpnc \ --with-pptp -%__make %{?_smp_mflags} || %__make +# Does not support parallel build +%__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=%{?buildroot} -C build +%__make install DESTDIR=%{?buildroot} +%find_lang knetworkmanager %clean @@ -147,18 +171,23 @@ /sbin/ldconfig -%files +%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,-) diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index c21e6f7..f01734a 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -49,9 +49,11 @@ BuildRequires: desktop-file-utils # FLEX -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?rhel} +%if 0%{?suse_version} || 0%{?mgaversion} BuildRequires: flex -%else +%endif +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: flex BuildRequires: flex-devel %endif diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant-14.0.0.spec index 70298de..27310a3 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant-14.0.0.spec @@ -47,6 +47,20 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +# Wireless support +%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 +BuildRequires: wireless-tools-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mdkversion} +BuildRequires: %{_lib}iw29-devel +%endif +%if 0%{?rhel} == 5 || 0%{?suse_version} +BuildRequires: wireless-tools +%endif +%if 0%{?suse_version} || 0%{?mgaversion} >= 3 +BuildRequires: libiw-devel +%endif + BuildRequires: gettext BuildRequires: python diff --git a/redhat/applications/yakuake/yakuake-14.0.0.spec b/redhat/applications/yakuake/yakuake-14.0.0.spec index 50b4d48..910f39f 100644 --- a/redhat/applications/yakuake/yakuake-14.0.0.spec +++ b/redhat/applications/yakuake/yakuake-14.0.0.spec @@ -23,6 +23,11 @@ %define _docdir %{tde_tdedocdir} +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" ** Diff limit reached (max: 250 lines) ** |