diff options
Diffstat (limited to 'redhat')
-rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem.spec | 2 | ||||
-rw-r--r-- | redhat/tdeaddons/tdeaddons-14.0.0.spec | 68 | ||||
-rw-r--r-- | redhat/tdeartwork/tdeartwork-14.0.0.spec | 2 | ||||
-rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 51 | ||||
-rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 33 | ||||
-rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 94 | ||||
-rw-r--r-- | redhat/tdevelop/tdevelop-14.0.0.spec | 13 |
7 files changed, 168 insertions, 95 deletions
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 282561b98..32320ba90 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -170,7 +170,7 @@ This package installs the Trinity directory structure. %post %if 0%{?suse_version} # Add setuid files in '/etc/permissions.local' -for b in fileshareset kgrantpty kpac_dhcp_helper start_tdeinit; do +for b in kgrantpty kpac_dhcp_helper start_tdeinit; do if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then echo "%{tde_bindir}/${b} root:root 4711" >>/etc/permissions.local fi diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 2ac162ece..4ec098bd9 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -1,36 +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" -%define _variant .opt -%endif - +# +# spec file for package tdeaddons +# +# 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_version 14.0.0 - -# TDE specific building variables +%define tde_pkg tdeaddons +%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_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_docdir} +# 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-tdeaddons +Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Plugins Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2 Group: User Interface/Desktops - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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@free.fr> + Obsoletes: trinity-kdeaddons < %{version}-%{release} Provides: trinity-kdeaddons = %{version}-%{release} Obsoletes: trinity-kdeaddons-extras < %{version}-%{release} @@ -42,9 +66,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqt3-devel >= 3.5.0 -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: trinity-tdegames-devel >= %{tde_version} @@ -730,6 +751,7 @@ fi -DBUILD_NOATUN_PLUGINS=ON \ -DBUILD_RENAMEDLG_PLUGINS=ON \ -DBUILD_TDEFILE_PLUGINS=ON \ + -DBUILD_TUTORIALS=OFF \ .. %__make %{?_smp_mflags} || %__make @@ -740,6 +762,16 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +# Temporary +%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter + + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file atlantikdesigner Game BoardGame +%suse_update_desktop_file -r ksig Network Email +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index 80dcff1ad..abc7828bc 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -56,7 +56,7 @@ BuildRequires: nas-devel # LIBART support %define with_libart 1 -BuildRequires: trinity-libart-lgpl-devel +BuildRequires: libart_lgpl-devel # XSCREENSAVER support %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 857654c63..1934eab27 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -1,7 +1,7 @@ # # spec file for package tdebase # -# Copyright (c) 2014 François Andriot <francois.andriot@free.fr> +# 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 @@ -17,6 +17,7 @@ # TDE variables %define tde_version 14.0.0 +%define tde_pkg tdebase %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -34,17 +35,17 @@ %endif -Name: trinity-tdebase -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: Trinity Base Programs -Group: User Interface/Desktops -URL: http://www.trinitydesktop.org/ +Name: trinity-%{tde_pkg} +Version: %{tde_version} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Trinity Base Programs +Group: User Interface/Desktops +URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} -License: GPL-2.0+ +License: GPL-2.0+ %else -License: GPLv2+ +License: GPLv2+ %endif #Vendor: Trinity Desktop @@ -53,14 +54,14 @@ License: GPLv2+ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 -Source2: pamd.kdm-trinity%{?dist} -Source3: pamd.kdm-trinity-np%{?dist} -Source4: pamd.kcheckpass-trinity%{?dist} -Source5: pamd.kscreensaver-trinity%{?dist} +Source2: pamd.kdm-trinity%{?dist} +Source3: pamd.kdm-trinity-np%{?dist} +Source4: pamd.kcheckpass-trinity%{?dist} +Source5: pamd.kscreensaver-trinity%{?dist} %endif # openSUSE: configuration file for TDM @@ -68,12 +69,12 @@ Source6: suse-displaymanagers-tdm # Fedora 18: use SYSTEMD for TDM startup %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Source7: tdm.service%{?dist} +Source7: tdm.service%{?dist} %endif # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!! %if 0%{?suse_version} == 1140 -Source7: xdm.oss114 +Source7: xdm.oss114 %endif # Fedora >= 17: special selinux policy required for TDM @@ -401,11 +402,17 @@ BuildRequires: lm_sensors-devel BuildRequires: libsensors4-devel %endif -# TSAK support (requires libudev-devel) +# UDEV support (requires libudev) # On RHEL5, udev is built statically, so TSAK cannot build. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define with_tsak 1 +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} BuildRequires: libudev-devel +%define with_tsak 1 +%define with_tdehwlib 1 +%endif + +# HAL support +%if 0%{?rhel} == 5 +%define with_hal 1 %endif # XRANDR support @@ -3561,14 +3568,14 @@ fi -DWITH_LIBRAW1394=ON \ -DWITH_SUDO_TDESU_BACKEND=OFF \ -DWITH_PAM=ON \ - -DWITH_SHADOW=ON \ + -DWITH_SHADOW=OFF \ -DWITH_XDMCP=ON \ -DWITH_XINERAMA=ON \ -DWITH_ARTS=ON \ -DWITH_I8K=ON \ -DWITH_SENSORS=ON \ - -DWITH_HAL=OFF \ - -DWITH_TDEHWLIB=ON \ + %{?with_hal:-DWITH_HAL=ON} \ + %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ -DWITH_ELFICON=OFF \ -DWITH_UPOWER=ON \ \ diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 9dd69488c..8040e0aa5 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -1,7 +1,7 @@ # # spec file for package tdelibs # -# Copyright (c) 2014 François Andriot <francois.andriot@free.fr> +# 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 @@ -21,16 +21,17 @@ # TDE variables %define tde_version 14.0.0 +%define tde_pkg tdelibs %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_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_docdir} # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" @@ -38,7 +39,7 @@ %endif -Name: trinity-tdelibs +Name: trinity-%{tde_pkg} Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Summary: TDE Libraries @@ -46,9 +47,9 @@ Group: System/GUI/Other URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} -License: GPL-2.0+ +License: GPL-2.0+ %else -License: GPLv2+ +License: GPLv2+ %endif #Vendor: Trinity Desktop @@ -58,7 +59,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: %{name}-rpmlintrc +Source1: trinity-tdelibs-rpmlintrc Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} @@ -213,18 +214,6 @@ BuildRequires: %{_lib}ltdl-devel BuildRequires: libtool-ltdl-devel %endif -# XCOMPOSITE support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xcomposite-devel -%else -BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXcomposite-devel -%endif - # X11 support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: x11-proto-devel @@ -499,8 +488,11 @@ Requires: libtqt3-mt-devel >= 3.5.0 Requires: libtqt4-devel = 2:4.2.0 Requires: trinity-arts-devel >= 2:1.5.10 +# ARTS support +Requires: trinity-arts-devel >= 2:1.5.10 + # LIBART_LGPL support -Requires: libart_lgpl-devel +Requires: libart_lgpl-devel >= 2.3.22 # XT support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} @@ -509,6 +501,7 @@ Requires: libXt-devel # XCOMPOSITE support %if 0%{?mgaversion} || 0%{?mdkversion} +%define %if 0%{?mgaversion} >= 4 Requires: %{_lib}xcomposite-devel %else @@ -607,6 +600,7 @@ fi %{?!with_pcre:-DWITH_PCRE=OFF} \ %{?!with_inotify:-DWITH_INOTIFY=OFF} \ %{?!with_gamin:-DWITH_GAMIN=OFF} \ + %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ %{?!with_tdehwlib:-DWITH_TDEHWLIB_DAEMONS=OFF} \ %{?with_hal:-DWITH_HAL=ON} \ %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \ @@ -621,6 +615,7 @@ fi %{?!with_lzma:-DWITH_LZMA=OFF} \ -DWITH_LIBBFD=OFF \ %{?!with_xrandr:-DWITH_XRANDR=OFF} \ + -DWITH_XCOMPOSITE=ON \ -DWITH_KDE4_MENU_SUFFIX=OFF \ \ -DWITH_ASPELL=ON \ diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index 86fc4171a..b8f25cd91 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -1,42 +1,59 @@ -# 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 - +# +# spec file for package tdemultimedia +# +# 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_version 14.0.0 - -# TDE specific building variables +%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_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_docdir} +# 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 -# former extras bits -%define _with_akode --with-akode -## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) -#define _with_musicbrainz --with-musicbrainz -%define _with_taglib --with-taglib Name: trinity-tdemultimedia Summary: Multimedia applications for the Trinity Desktop Environment (TDE) Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2 Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> 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@free.fr> + Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,27 +69,33 @@ Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release} Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} -BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqt3-devel >= 3.5.0 -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} -%if "%{?_with_akode}" != "" +BuildRequires: autoconf automake libtool m4 + +# TAGLIB support +%define _with_taglib --with-taglib +BuildRequires: taglib-devel + +# AKODE support +%define _with_akode --with-akode BuildRequires: trinity-akode-devel BuildRequires: trinity-akode-libmad -%endif BuildRequires: desktop-file-utils BuildRequires: zlib-devel +# MUSICBRAINZ support +## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) +#define _with_musicbrainz --with-musicbrainz +#BuildRequires: libmusicbrainz-devel libtunepimp-devel + # Audio libraries BuildRequires: libvorbis-devel BuildRequires: audiofile-devel BuildRequires: libtheora-devel BuildRequires: alsa-lib-devel -%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel} -%{?_with_taglib:BuildRequires: taglib-devel} BuildRequires: cdparanoia # CDDA support @@ -1141,7 +1164,7 @@ noatun plugins. ########## -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} %debug_package %endif @@ -1208,6 +1231,21 @@ export PATH="%{tde_bindir}:${PATH}" # don't make these world-writeable chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/* +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file krec AudioVideo Recorder +%suse_update_desktop_file tdemid AudioVideo Midi +%suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing +%suse_update_desktop_file artscontrol AudioVideo AudioVideoEditing +%suse_update_desktop_file kmix AudioVideo Mixer +%suse_update_desktop_file kaboodle AudioVideo Player +%suse_update_desktop_file kaudiocreator AudioVideo CD +%suse_update_desktop_file kscd AudioVideo Player CD +%suse_update_desktop_file noatun AudioVideo Player Video +%suse_update_desktop_file juk AudioVideo Player Jukebox +%suse_update_desktop_file audiocd +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec index abf654c26..7d15ac589 100644 --- a/redhat/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/tdevelop/tdevelop-14.0.0.spec @@ -45,20 +45,21 @@ Patch4: c_cpp_reference-2.0.2-install.patch Requires: %{name}-libs = %{version}-%{release} +BuildRequires: tqt3-apps-devel >= 3.5.0 +BuildRequires: libtqt4-devel >= 2:4.2.0 +BuildRequires: trinity-arts-devel >= 2:1.5.10 +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdesdk-devel >= %{tde_version} Requires: make Requires: perl Requires: flex >= 2.5.4 -Requires: trinity-tqt3-designer >= 3.5.0 -Requires: trinity-tqt3-devel >= 3.5.0 +Requires: tqt3-designer >= 3.5.0 +Requires: libtqt3-mt-devel >= 3.5.0 Requires: gettext Requires: ctags BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdesdk-devel >= %{tde_version} %if 0%{?rhel} || 0%{?fedora} BuildRequires: db4-devel %endif |