RPM packaging: updates

pull/3/head
François Andriot 10 years ago
parent f0e09cb4f6
commit 430c48787e

@ -187,12 +187,6 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/curl) $(call buildpkg,3rdparty/curl)
endif endif
libotr3:
# Build on Mageia, CentOS >= 7
ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/libotr3)
endif
libtool: autoconf automake libtool: autoconf automake
# Build on CentOS 5 only # Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),) ifneq ($(wildcard /boot/vmlinuz*.el5*),)
@ -239,7 +233,10 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif endif
torsocks: torsocks:
# Do NOT build on RHEL 7
ifeq ($(wildcard /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/torsocks) $(call buildpkg,3rdparty/torsocks)
endif
wv2: wv2:
# Do NOT build on Mageia or openSUSE or PCLINUXOS # Do NOT build on Mageia or openSUSE or PCLINUXOS
@ -480,7 +477,7 @@ koffice: tdebase wv2
konversation: tdebase konversation: tdebase
$(call buildpkg,applications/konversation) $(call buildpkg,applications/konversation)
kopete-otr: tdebase libotr3 kopete-otr: tdebase
$(call buildpkg,applications/kopete-otr) $(call buildpkg,applications/kopete-otr)
kpicosim: tdebase kpicosim: tdebase

@ -1,45 +1,68 @@
# 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_version 14.0.0
%define tde_pkg knetworkmanager
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %define tde_prefix /opt/trinity
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man %define tde_mandir %{tde_prefix}/man
%define tde_appdir %{tde_datadir}/applications %define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdeappdir %{tde_appdir}/tde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%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"
%define _variant .opt
%endif
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}8
Epoch: %{tde_epoch}
Version: 0.8 Version: 0.8
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: Trinity applet for Network Manager Summary: Trinity applet for Network Manager
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Internet Group: Applications/Internet
License: GPLv2+ URL: http://www.trinitydesktop.org/
URL: http://en.opensuse.org/Projects/KNetworkManager
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz %if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
Patch0: knetworkmanager-3.5.13-missing_includes.patch #Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
#Requires: kde-filesystem #Requires: kde-filesystem
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -73,7 +96,7 @@ Provides: trinity-knetworkmanager-devel = %{version}-%{release}
Development headers for knetworkmanager Development headers for knetworkmanager
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
@ -89,7 +112,6 @@ Development headers for knetworkmanager
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Warning: --enable-final causes FTBFS # Warning: --enable-final causes FTBFS
%configure \ %configure \
@ -113,12 +135,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--with-vpnc \ --with-vpnc \
--with-pptp --with-pptp
%__make %{?_smp_mflags} || %__make # Does not support parallel build
%__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=%{?buildroot} -C build %__make install DESTDIR=%{?buildroot}
%find_lang knetworkmanager
%clean %clean
@ -147,18 +171,23 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig /sbin/ldconfig
%files %files -f knetworkmanager.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/knetworkmanager %{tde_bindir}/knetworkmanager
%{tde_libdir}/*.la %{tde_libdir}/*.la
%{tde_libdir}/*.so %{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 %{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
%{tde_tdeappdir}/knetworkmanager.desktop %{tde_tdeappdir}/knetworkmanager.desktop
%{tde_datadir}/apps/knetworkmanager %{tde_datadir}/apps/knetworkmanager
%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager* %{tde_datadir}/icons/hicolor/*/apps/knetworkmanager*
%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop %{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop
%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.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 %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)

@ -49,9 +49,11 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# FLEX # FLEX
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?rhel} %if 0%{?suse_version} || 0%{?mgaversion}
BuildRequires: flex
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: flex BuildRequires: flex
%else
BuildRequires: flex-devel BuildRequires: flex-devel
%endif %endif

@ -47,6 +47,20 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils 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: gettext
BuildRequires: python BuildRequires: python

@ -23,6 +23,11 @@
%define _docdir %{tde_tdedocdir} %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"
%define _variant .opt
%endif
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology.

@ -84,6 +84,7 @@ rpmbuild -ba \
--define "with_lame 1" \ --define "with_lame 1" \
--define "with_mad 1" \ --define "with_mad 1" \
--define "with_mpeg 1" \ --define "with_mpeg 1" \
--define "with_xine 1" \
--define "with_xscreensaver 1" \ --define "with_xscreensaver 1" \
"${TEMPDIR}/${SPECFILE##*/}" "${TEMPDIR}/${SPECFILE##*/}"
RET=$? RET=$?

@ -34,3 +34,5 @@ if [ -x /usr/bin/zypper ]; then
sudo zypper ar -G ${RPMDIR}/${ARCH} rpmbuild.${ARCH} sudo zypper ar -G ${RPMDIR}/${ARCH} rpmbuild.${ARCH}
sudo zypper ar -G ${RPMDIR}/noarch rpmbuild.noarch sudo zypper ar -G ${RPMDIR}/noarch rpmbuild.noarch
fi fi
# PCLOS

@ -42,7 +42,8 @@ case $a in
DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)" DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)"
;; ;;
# PCLinuxOS # PCLinuxOS
PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";; #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";;
PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";;
*) echo "distrib non reconnue !! $a";; *) echo "distrib non reconnue !! $a";;
esac esac

@ -190,14 +190,16 @@ Requires: trinity-kpilot
# Network management # Network management
# RHEL 6 and openSUSE 11.x: knetworkmanager8 # RHEL 6 and openSUSE 11.x: knetworkmanager8
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
Requires: trinity-knetworkmanager Requires: trinity-knetworkmanager8
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 1140 %if 0%{?suse_version} && 0%{?suse_version} <= 1140
Requires: trinity-knetworkmanager Requires: trinity-knetworkmanager
%endif %endif
# Other distros use tdenetworkmanager (since R14) # Other distros use tdenetworkmanager (since R14)
%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} %if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-tdenetworkmanager Requires: trinity-tdenetworkmanager
Obsoletes: trinity-knetworkmanager
Obsoletes: trinity-knetworkmanager8
%endif %endif
# Power management # Power management

@ -29,11 +29,15 @@
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdelibdir %{tde_libdir}/trinity %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
Name: trinity-filesystem Name: trinity-filesystem
Version: %{tde_version} Version: %{tde_version}
Release: 1%{?dist} Release: 1%{?dist}%{?_variant}
Summary: Trinity Directory Layout Summary: Trinity Directory Layout
Group: System/Fhs Group: System/Fhs
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/

@ -36,6 +36,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %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
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: Administrative tools for TDE Summary: Administrative tools for TDE

@ -1,43 +1,60 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". #
%if "%{?tde_prefix}" != "/usr" # spec file for package tdeadmin (version 3.5.13-SRU)
%define _variant .opt #
%endif # 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 1
%define tde_version 3.5.13.2 %define tde_version 3.5.13.2
%define tde_pkg tdeadmin
# TDE specific building variables %define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_sbindir %{tde_prefix}/sbin %define tde_sbindir %{tde_prefix}/sbin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-tdeadmin
Summary: Administrative tools for TDE
Version: %{tde_version}
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 Name: trinity-%{tde_pkg}
Group: User Interface/Desktops Summary: Administrative tools for TDE
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Version: %{tde_version}
Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
Vendor: Trinity Project %if 0%{?suse_version}
Packager: Francois Andriot <francois.andriot@free.fr> License: GPL-2.0+
URL: http://www.trinitydesktop.org/ %else
License: GPLv2+
%endif
Prefix: %{tde_prefix} #Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Obsoletes: trinity-kdeadmin < %{version}-%{release} Prefix: %{tde_prefix}
Provides: trinity-kdeadmin = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kuser.pam Source1: kuser.pam
@ -46,17 +63,39 @@ Source5: kpackagerc
Source6: ksysvrc Source6: ksysvrc
Source7: kuserrc Source7: kuserrc
BuildRequires: autoconf automake libtool m4 Obsoletes: trinity-kdeadmin < %{version}-%{release}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} Provides: trinity-kdeadmin = %{version}-%{release}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: m4
BuildRequires: fdupes
BuildRequires: gcc-c++
# 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
# RPM support
BuildRequires: rpm-devel BuildRequires: rpm-devel
# PAM support
BuildRequires: pam-devel BuildRequires: pam-devel
# LILO support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_lilo 1 #define with_lilo 1
%endif %endif
%if 0%{?with_lilo} %if 0%{?with_lilo}
BuildRequires: lilo BuildRequires: lilo
%endif %endif
@ -70,6 +109,8 @@ Requires: trinity-ksysv = %{version}-%{release}
Requires: trinity-kuser = %{version}-%{release} Requires: trinity-kuser = %{version}-%{release}
%if 0%{?with_lilo} %if 0%{?with_lilo}
Requires: trinity-lilo-config = %{version}-%{release} Requires: trinity-lilo-config = %{version}-%{release}
%else
Obsoletes: trinity-lilo-config
%endif %endif
# CONSOLEHELPER (usermode) support # CONSOLEHELPER (usermode) support
@ -96,7 +137,7 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%package -n trinity-kcron %package -n trinity-kcron
Summary: The Trinity crontab editor Summary: The Trinity crontab editor
Group: Applications/Utilities Group: System/GUI/Other
%description -n trinity-kcron %description -n trinity-kcron
KCron is an application for scheduling programs to run in the background. KCron is an application for scheduling programs to run in the background.
@ -106,7 +147,7 @@ It is a graphical user interface to cron, the UNIX system scheduler.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/kcron %{tde_bindir}/kcron
%{tde_tdeappdir}/kcron.desktop %{tde_tdeappdir}/kcron.desktop
%{tde_datadir}/apps/kcron/kcronui.rc %{tde_datadir}/apps/kcron/
%{tde_datadir}/icons/hicolor/*/apps/kcron.png %{tde_datadir}/icons/hicolor/*/apps/kcron.png
%{tde_tdedocdir}/HTML/en/kcron/ %{tde_tdedocdir}/HTML/en/kcron/
@ -128,7 +169,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kdat %package -n trinity-kdat
Summary: A Trinity tape backup tool Summary: A Trinity tape backup tool
Group: Applications/Utilities Group: System/GUI/Other
%description -n trinity-kdat %description -n trinity-kdat
KDat is a tar-based tape archiver. It is designed to work with multiple KDat is a tar-based tape archiver. It is designed to work with multiple
@ -169,10 +210,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package kfile-plugins %package kfile-plugins
Summary: Trinity file metainfo plugins for deb and rpm files Summary: Trinity file metainfo plugins for deb and rpm files
Group: Environment/Libraries Group: System/GUI/Other
%description kfile-plugins %description kfile-plugins
File metainfo plugins for deb and rpm package files. This package contains the Trinity File metainfo plugins for deb and rpm
package files.
%files kfile-plugins %files kfile-plugins
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -187,7 +229,7 @@ File metainfo plugins for deb and rpm package files.
%package -n trinity-knetworkconf %package -n trinity-knetworkconf
Summary: Trinity network configuration tool Summary: Trinity network configuration tool
Group: Applications/Utilities Group: System/GUI/Other
%description -n trinity-knetworkconf %description -n trinity-knetworkconf
This is a TDE control center module to configure TCP/IP settings. It This is a TDE control center module to configure TCP/IP settings. It
@ -223,7 +265,7 @@ done
%package -n trinity-kpackage %package -n trinity-kpackage
Summary: Trinity package management tool Summary: Trinity package management tool
Group: Applications/Utilities Group: System/GUI/Other
%description -n trinity-kpackage %description -n trinity-kpackage
This is a frontend to both .rpm and .deb package formats. It allows you This is a frontend to both .rpm and .deb package formats. It allows you
@ -258,7 +300,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-ksysv %package -n trinity-ksysv
Summary: Trinity SysV-style init configuration editor Summary: Trinity SysV-style init configuration editor
Group: Applications/Utilities Group: System/GUI/Other
%description -n trinity-ksysv %description -n trinity-ksysv
This program allows you to edit your start and stop scripts using a This program allows you to edit your start and stop scripts using a
@ -295,7 +337,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kuser %package -n trinity-kuser
Summary: Trinity user/group administration tool Summary: Trinity user/group administration tool
Group: Applications/Utilities Group: System/GUI/Other
%if 0%{?with_consolehelper} %if 0%{?with_consolehelper}
# package 'usermode' provides '/usr/bin/consolehelper-gtk' # package 'usermode' provides '/usr/bin/consolehelper-gtk'
@ -347,7 +389,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%if 0%{?with_lilo} %if 0%{?with_lilo}
%package -n trinity-lilo-config %package -n trinity-lilo-config
Summary: Trinity frontend for lilo configuration Summary: Trinity frontend for lilo configuration
Group: Applications/Utilities Group: System/GUI/Other
Requires: trinity-kcontrol Requires: trinity-kcontrol
Requires: trinity-tdebase-bin Requires: trinity-tdebase-bin
#Requires: lilo #Requires: lilo
@ -372,7 +414,7 @@ touch /etc/lilo.conf
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package %debug_package
%endif %endif
@ -468,6 +510,26 @@ done
# * Removed useless program secpolicy. (Closes: #399426) # * Removed useless program secpolicy. (Closes: #399426)
%__rm -f %{?buildroot}%{tde_bindir}/secpolicy %__rm -f %{?buildroot}%{tde_bindir}/secpolicy
# Remove lilo related files, if unwanted.
%if 0%{?with_lilo} == 0
%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
%endif
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file kdat System Backup
%suse_update_desktop_file kpackage System PackageManager
%suse_update_desktop_file kcron System ServiceConfiguration
%suse_update_desktop_file ksysv System ServiceConfiguration
%suse_update_desktop_file kuser System SystemSetup
%endif
# Links duplicate files
%fdupes "%{?buildroot}%{tde_datadir}"
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}

@ -35,6 +35,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %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
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: Additional artwork (themes, sound themes, ...) for TDE Summary: Additional artwork (themes, sound themes, ...) for TDE

@ -1,5 +0,0 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -1,7 +0,0 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
account include system-auth
password include system-auth
session include system-auth
session optional pam_console.so

@ -1,7 +0,0 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
account include system-auth
password include system-auth
session include system-auth
session optional pam_console.so

@ -1,8 +0,0 @@
#%PAM-1.0
auth include system-auth
auth required pam_nologin.so
account include system-auth
password include system-auth
session include system-auth
session optional pam_console.so
session required pam_namespace.so

@ -1,8 +0,0 @@
#%PAM-1.0
auth include system-auth
auth required pam_nologin.so
account include system-auth
password include system-auth
session include system-auth
session optional pam_console.so
session required pam_namespace.so

@ -1,5 +0,0 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -1,5 +0,0 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -1,5 +0,0 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -3644,10 +3644,11 @@ EOF
%endif %endif
# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version) # Symlinks 'usb.ids' (Use system-provided version, not TDE provided version)
%if 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 || 0%{?mgaversion} >= 4
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%if 0%{?suse_version} || 0%{?mgaversion} >= 4
%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%else %else
%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
%endif %endif

@ -253,20 +253,25 @@ BuildRequires: xz-devel
%endif %endif
# Certificates support # Certificates support
%if 0%{?fedora} %if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: ca-certificates BuildRequires: ca-certificates
Requires: ca-certificates Requires: ca-certificates
%if 0%{?fedora} == 20 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 6
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%endif %endif
%if 0%{?fedora} == 18 || 0%{?fedora} == 19 %if 0%{?fedora} == 18 || 0%{?fedora} == 19
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt %define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
%endif %endif
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{pclinuxos}
Requires: rootcerts
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
%else
%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
Requires: openssl Requires: openssl
%endif %endif
%endif
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
Requires: openssl Requires: openssl
@ -341,10 +346,12 @@ BuildRequires: libudev-devel
# UDISKS support # UDISKS support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
%if 0%{?pclinuxos} == 0
%define with_udisks 1 %define with_udisks 1
BuildRequires: udisks-devel BuildRequires: udisks-devel
Requires: udisks Requires: udisks
%endif %endif
%endif
# PMOUNT support # PMOUNT support
#Requires: pmount #Requires: pmount

@ -1268,6 +1268,11 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--with-flac \ --with-flac \
%{?with_xine:--with-xine} %{!?with_xine:--without-xine} %{?with_xine:--with-xine} %{!?with_xine:--without-xine}
# Fix unexplained "undefined reference to `__stack_chk_fail'"
%if 0%{?mgaversion} == 4
%__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/"
%endif
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -34,6 +34,11 @@
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %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
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: Integrated Development Environment for C++/C Summary: Integrated Development Environment for C++/C

@ -189,3 +189,4 @@ xscreensaver
xscreensaver-extras xscreensaver-extras
xulrunner-devel xulrunner-devel
xz-devel xz-devel
flex-devel

@ -165,3 +165,9 @@ xmlto
xorg-x11-font-utils xorg-x11-font-utils
xulrunner-devel xulrunner-devel
xz-devel xz-devel
librsvg2-tools
sword-devel
readline-devel
pilot-link-devel
lirc-devel
wireless-tools-devel

@ -1,4 +1,5 @@
GraphicsMagick-devel GraphicsMagick-devel
libotr-devel
ImageMagick-devel ImageMagick-devel
NetworkManager-glib-devel NetworkManager-glib-devel
OpenEXR-devel OpenEXR-devel
@ -207,3 +208,5 @@ yaz
zlib-devel zlib-devel
fdupes fdupes
firebird-devel firebird-devel
GraphicsMagick-devel
dssi-devel

@ -164,3 +164,4 @@ liblcms-devel
gtk3-devel gtk3-devel
libffmpeg-devel libffmpeg-devel
mozilla-nspr-devel mozilla-nspr-devel
libpisock-devel

@ -0,0 +1,78 @@
audit-devel
bison
libcap-devel
openldap-devel
pam-devel
gcc-c++
ccache
libjpeg-devel
libmng-devel
libpng-devel
freetype-devel
fontconfig-devel
glib2-devel
cups-devel
nas-devel
libxrandr-devel
libxrender-devel
libxcursor-devel
libxinerama-devel
libxft-devel
libxext-devel
libx11-devel
libsm-devel
libice-devel
libxmu-devel
libxi-devel
mesaglu-devel
mysql-devel
unixODBC-devel
sqlite-devel
postgresql-devel
postgresql
firebird-devel
lib64gif-devel
sqlite3-devel
cmake
pth-devel
audiofile-devel
alsa-lib-devel
gsl-devel
libvorbis-devel
esound-devel
libjack-devel
libmad-devel
fdupes
gtk2-devel
libcurl-devel
python-devel
gettext-devel
libflac-devel
libpulseaudio-devel
speex-devel
libxslt-devel
aspell-devel
gamin-devel
libutempter-devel
libjasper-devel
hspell-devel
OpenEXR-devel
file-devel
libnm-util-devel
libudev-devel
udisks2-devel
htdig
libraw1394
devel
libusb1.0-devel
libusb-compat0.1-devel
lm_sensors-devel
libxscrnsaver-devel
libsmbclient-devel
imake
libxkbfile-devel
libfontenc-devel
x11-font-util
libconfig-devel
xscreensaver-base
Loading…
Cancel
Save