RPM Packaging: update 3.5.13.2 packages

pull/3/head
François Andriot 10 years ago
parent 3b208c4d6f
commit 8ef20fb122

@ -100,7 +100,7 @@ tdegames: tdebase tdemultimedia
tdegraphics: tdebase poppler cmake
$(call buildpkg,tdegraphics)
tdelibs: tqt3 tqtinterface trinity-filesystem arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset libart_lgpl
tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl
$(call buildpkg,tdelibs)
tdemultimedia: tdebase akode
@ -582,7 +582,7 @@ smb4k: tdebase
soundkonverter: tdebase
$(call buildpkg,applications/soundkonverter)
tde-guidance: pytdeextensions
tde-guidance: tdebase pytdeextensions
$(call buildpkg,applications/tde-guidance)
tdeio-apt: tdebase
@ -669,6 +669,9 @@ meta:
fileshareset:
$(call buildpkg,extras/fileshareset)
trinity-filesystem:
$(call buildpkg,extras/trinity-filesystem)
icons-nuvola:
$(call buildpkg,extras/icons-nuvola)
@ -701,6 +704,3 @@ scribus:
style-ia-ora:
$(call buildpkg,extras/style-ia-ora)
trinity-filesystem:
$(call buildpkg,extras/trinity-filesystem)

@ -1,9 +1,11 @@
SHELL := /bin/bash
PACKAGING_DIR := $(shell cd ..; pwd)
PATH := $(PATH):$(shell pwd)/build
TDE_VERSION = 3.5.13.2
buildpkg = \
@echo "Now processing '$(1)' ."; \
@echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \
export PACKAGING_DIR=$(PACKAGING_DIR); \
if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \
echo " Package '${1}' is not yet installed."; \
if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \
@ -18,7 +20,7 @@ buildpkg = \
echo
all: dependencies main libraries applications i18n meta
all: dependencies main libraries applications i18n meta extras
dependencies: qt3 tqtinterface arts libcaldav libcarddav tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode hal
main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
libraries: libkdcraw libkexiv2 libkipi libksquirrel pytdeextensions python-trinity
@ -27,10 +29,10 @@ i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
### Trinity Dependencies
arts: tqtinterface esound cmake
arts: tqtinterface trinity-filesystem esound cmake
$(call buildpkg,dependencies/arts)
avahi-tqt: tqtinterface
avahi-tqt: tqtinterface autoconf automake libtool
$(call buildpkg,dependencies/avahi-tqt)
dbus-1-tqt: tqtinterface cmake
@ -70,7 +72,7 @@ tdeadmin: tdebase
tdeartwork: tdebase
$(call buildpkg,tdeartwork)
tdebase: tdelibs htdig cmake hal
tdebase: tdelibs cmake htdig fileshareset hal
$(call buildpkg,tdebase)
tdebindings: tdebase
@ -85,7 +87,7 @@ tdegames: tdebase tdemultimedia
tdegraphics: tdebase poppler cmake
$(call buildpkg,tdegraphics)
tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem
$(call buildpkg,tdelibs)
tdemultimedia: tdebase akode
@ -126,8 +128,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif
cmake:
# Build on CentOS only
ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),)
# Build on CentOS 5/6 only
ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/cmake)
endif
@ -158,7 +160,7 @@ endif
htdig:
# build on Mageia, and CentOS >= 7
ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/htdig)
$(call buildpkg,extras/htdig)
endif
imlib1:
@ -196,7 +198,7 @@ ifneq ($(wildcard /boot/vmlinuz*.el6*),)
endif
m4:
# Build on CentOS 5 only (vendor-provided Poppler is too old)
# Build on CentOS 5 only (vendor-provided m4 is too old)
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/m4)
endif
@ -244,6 +246,11 @@ endif
akode: tqtinterface
$(call buildpkg,extras/akode)
cmake-macros: cmake
ifneq ($(wildcard /etc/SuSE-release),)
$(call buildpkg,extras/trinity-cmake-macros)
endif
### Trinity Libraries
kipi-plugins: tqtinterface libkipi
$(call buildpkg,libraries/kipi-plugins)
@ -263,9 +270,6 @@ libksquirrel: tqtinterface
mlt: tqtinterface
$(call buildpkg,libraries/mlt)
mlt++: tqtinterface
$(call buildpkg,libraries/mlt++)
pytdeextensions: tqtinterface python-trinity
$(call buildpkg,libraries/pytdeextensions)
@ -558,5 +562,11 @@ meta:
$(call buildpkg,extras/trinity-desktop)
### Extra packages
fileshareset:
$(call buildpkg,extras/fileshareset)
trinity-filesystem:
$(call buildpkg,extras/trinity-filesystem)
ksensors:
$(call buildpkg,applications/ksensors)

@ -44,11 +44,6 @@ if [ -r "${TEMPDIR}/one.patch" ]; then
-e "/%setup/ s/$/\n%patch0 -p1/"
fi
# Determines if we are running an i386 or x86_64 distro
if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then
ARGS="${ARGS} --target=i686"
fi
[ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"

@ -5,12 +5,8 @@ PKGNAME="$1"
TDE_VERSION="${2:-14.0.0}"
RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
if [ $(uname -i) == "x86_64" ]; then
RPMDIR_ARCH=${RPMDIR}/x86_64
else
RPMDIR_ARCH=${RPMDIR}/i?86
fi
RPMDIR_NOARCH=${RPMDIR}/noarch
RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
RPMDIR_NOARCH="${RPMDIR}/noarch"
RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
case "${PKGNAME##*/}" in

@ -29,7 +29,7 @@
%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_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
@ -43,7 +43,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.5.10
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Summary: ARTS (analog realtime synthesizer) - the TDE sound system
Group: System Environment/Daemons
URL: http://www.trinitydesktop.org/
@ -81,7 +81,7 @@ BuildRequires: libvorbis-devel
BuildRequires: esound-devel
# JACK support
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} [[ 0%{?with_jack}
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
%define with_jack 1
%if 0%{?mgaversion} || 0%{?mdkversion}
%define jack_devel %{_lib}jack-devel
@ -312,6 +312,9 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
%changelog
* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2
- Rebuild.
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1
- Build for Fedora 19

@ -1,50 +1,83 @@
# TDE specific building variables
#
# spec file for package avahi-tqt (version 3.5.13-SRU)
#
# 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 1
%define tde_version 3.5.13.2
%define tde_prefix /usr
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
%define libavahi %{_lib}avahi
%else
%define libavahi libavahi
%endif
Name: trinity-avahi-tqt
Epoch: 1
Epoch: %{tde_epoch}
Version: 0.6.30
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: Avahi TQT Interface
Group: System Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Summary: Avahi TQt integration library
Group: System/Libraries
URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
%if 0%{?suse_version}
License: LGPL-2.0+
%else
License: LGPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0
BuildRequires: gcc-c++
BuildRequires: qt3-devel >= 3.3.8d
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: gettext-devel
BuildRequires: pkgconfig
BuildRequires: libtool
# GETTEXT support
BuildRequires: gettext-devel
# DBUS support
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: dbus-devel
%endif
# PCAP support
BuildRequires: libcap-devel
# AVAHI support
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Provides: %{_lib}avahi-qt3
%define avahi_devel %{_lib}avahi-client-devel
%endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
BuildRequires: avahi-devel
%define avahi_devel avahi-devel
%endif
%{?avahi_devel:BuildRequires: %{avahi_devel}}
# EXPAT support
# EXPAT support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel
%endif
@ -52,59 +85,135 @@ BuildRequires: expat-devel
BuildRequires: libexpat-devel
%endif
Requires: qt3 >= 3.3.8d
Requires: trinity-tqtinterface >= %{tde_version}
Obsoletes: avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
# NAS support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_nas 1
BuildRequires: nas-devel
%endif
# XT support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXt-devel
%endif
%description
Avahi TQT Interface
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
example you can plug into a network and instantly find printers to
print to, files to look at and people to talk to.
.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
##########
%package -n %{libavahi}-tqt1
Summary: Avahi TQt integration library
Group: System/Libraries
Provides: libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n %{libavahi}-tqt1
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
example you can plug into a network and instantly find printers to
print to, files to look at and people to talk to.
.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
%post -n %{libavahi}-tqt1
/sbin/ldconfig || :
%package devel
Summary: %{name} - Development files
Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%postun -n %{libavahi}-tqt1
/sbin/ldconfig || :
%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: %{_lib}avahi-qt3-devel
%endif
%files -n %{libavahi}-tqt1
%defattr(-,root,root,-)
%{_libdir}/libavahi-tqt.so.1
%{_libdir}/libavahi-tqt.so.1.0.0
##########
%package -n %{libavahi}-tqt-devel
Summary: Avahi TQt integration library (Development Files)
Group: Development/Libraries/C and C++
Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt4-devel >= %{tde_epoch}:4.2.0
%{?avahi_devel:Requires: %{avahi_devel}}
Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n %{libavahi}-tqt-devel
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
example you can plug into a network and instantly find printers to
print to, files to look at and people to talk to.
.
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
%post -n %{libavahi}-tqt-devel
/sbin/ldconfig || :
Obsoletes: avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%postun -n %{libavahi}-tqt-devel
/sbin/ldconfig || :
%description devel
Development files for %{name}
%files -n %{libavahi}-tqt-devel
%defattr(-,root,root,-)
%{_includedir}/avahi-tqt/
%{_libdir}/libavahi-tqt.so
%{_libdir}/libavahi-tqt.la
%{_libdir}/pkgconfig/avahi-tqt.pc
##########
%if 0%{?suse_version} || 0%{?pclinuxos}
%if 0%{?pclinuxos}
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
export NOCONFIGURE=1
./autogen.sh
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
%configure \
--exec-prefix=%{tde_prefix} \
--includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \
--exec-prefix=%{_prefix} \
--includedir=%{_includedir} \
--libdir=%{_libdir} \
\
--disable-static \
--disable-dependency-tracking \
\
--enable-compat-libdns_sd \
--with-systemdsystemunitdir=/lib/systemd/system
--with-systemdsystemunitdir=/lib/systemd/system \
%if 0%{?suse_version}
--with-distro=suse \
%endif
%if 0%{?fedora} || 0%{?rhel}
--with-distro=fedora \
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
--with-distro=mandriva \
%endif
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install
@ -115,30 +224,10 @@ export PATH="%{tde_bindir}:${PATH}"
%clean
%__rm -rf %{?buildroot}
%post
/sbin/ldconfig || :
%postun
/sbin/ldconfig || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files
%defattr(-,root,root,-)
%{tde_libdir}/libavahi-tqt.so.1
%{tde_libdir}/libavahi-tqt.so.1.0.0
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/avahi-tqt/
%{tde_libdir}/libavahi-tqt.so
%{tde_libdir}/libavahi-tqt.la
%{tde_libdir}/pkgconfig/avahi-tqt.pc
%changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-2
- Rename package to 'libavahi-tqt'
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.6.30-1
- Initial release for TDE 3.5.13.2

@ -29,7 +29,7 @@
Name: trinity-dbus-1-tqt
Epoch: %{tde_epoch}
Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Summary: dbus bindings for the Trinity Qt [TQt] interface
Group: System/Libraries
URL: http://www.trinitydesktop.org/
@ -168,7 +168,7 @@ fi
-DLIB_INSTALL_DIR=%{_libdir} \
..
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install
@ -181,6 +181,9 @@ fi
%changelog
* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.9-2
- Rename package to 'libdbus-1-tqt'
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.9-1
- Build for Fedora 19

@ -29,7 +29,7 @@
Name: trinity-dbus-tqt
Epoch: %{tde_epoch}
Version: 0.63
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
Summary: Simple inter-process messaging system
Group: System/Libraries
URL: http://www.trinitydesktop.org/
@ -192,6 +192,9 @@ fi
%changelog
* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:0.63-2
- Rename package to 'libdbus-tqt-1'
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.63-1
- Build for Fedora 19

@ -20,7 +20,8 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_version 14.0.0
%define tde_epoch 1
%define tde_version 3.5.13.2
%define tde_pkg tqtinterface
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@ -48,7 +49,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 4.2.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
Summary: The Trinity Qt Interface Libraries
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
@ -141,6 +142,8 @@ although some code has been added for useful functions that are no longer part o
%files -n %{libtqt4}
%defattr(-,root,root,-)
%{_libdir}/libtqassistantclient.so.4
%{_libdir}/libtqassistantclient.so.4.2.0
%{_libdir}/libtqt.so.4
%{_libdir}/libtqt.so.4.2.0
@ -194,10 +197,11 @@ although some code has been added for useful functions that are no longer part o
%{_bindir}/tqt-replace-stream
%{_bindir}/uic-tqt
%{_includedir}/tqt/
%{_libdir}/libtqassistantclient.la
%{_libdir}/libtqassistantclient.so
%{_libdir}/libtqt.la
%{_libdir}/libtqt.so
%{_libdir}/pkgconfig/tqt.pc
%{_libdir}/pkgconfig/tqtqui.pc
%{cmake_modules_dir}/*.cmake
##########
@ -258,7 +262,7 @@ fi
# RHEL 5: add newline at end of include files to avoid warnings
%if 0%{?rhel} && 0%{?rhel} <= 5
for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
for i in %{?buildroot}%{_includedir}/tqt/*.h; do
echo "" >>${i}
done
%endif
@ -275,6 +279,9 @@ done
%changelog
* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-3
- Rename package to 'libtqt4'
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
- Build for Fedora 19

@ -1,7 +1,7 @@
#
# spec file for package brp-check-trinity
# spec file for package brp-check-trinity (version R14.0.0)
#
# 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

@ -1,7 +1,7 @@
#
# spec file for package fileshareset
#
# 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

@ -1,7 +1,7 @@
#
# spec file for package trinity-filesystem
# spec file for package trinity-filesystem (version R14.0.0)
#
# 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

@ -1,7 +1,7 @@
#
# spec file for package trinity-filesystem (version 3.5.13-SRU)
#
# 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

File diff suppressed because it is too large Load Diff

@ -509,8 +509,8 @@ Obsoletes: trinity-kdelibs-devel < %{version}-%{release}
Provides: trinity-kdelibs-devel = %{version}-%{release}
Requires: libtqt3-mt-devel >= 3.5.0
Requires: libtqt4-devel = 2:4.2.0
Requires: trinity-arts-devel >= 2:1.5.10
Requires: libtqt4-devel = %{tde_epoch}:4.2.0
Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: libart_lgpl-devel
%{?xcomposite_devel:Requires: %{xcomposite_devel}}
%{?xt_devel:Requires: %{xt_devel}}

@ -1,7 +1,7 @@
#
# spec file for package tdelibs
# spec file for package tdelibs (version 3.5.13-SRU)
#
# 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
@ -20,17 +20,19 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_epoch 1
%define tde_version 3.5.13.2
%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/kde
%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 +40,7 @@
%endif
Name: trinity-tdelibs
Name: trinity-%{tde_pkg}
Version: %{tde_version}
Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
Summary: TDE Libraries
@ -51,13 +53,14 @@ License: GPL-2.0+
License: GPLv2+
%endif
#Vendor: Trinity Project
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: trinity-tdelibs-rpmlintrc
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
@ -66,27 +69,53 @@ Provides: trinity-kdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release}
Provides: trinity-kdelibs-apidocs = %{version}-%{release}
# Trinity dependencies
BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: libtqt4-devel = 1:4.2.0
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: libdbus-tqt-1-devel >= 1:0.63
BuildRequires: libdbus-1-tqt-devel >= 1:0.9
# for set_permissions macro
%if 0%{?suse_version}
PreReq: permissions
%endif
Requires: trinity-arts >= 1:1.5.10
# Trinity dependencies
BuildRequires: libtqt4-devel = %{tde_epoch}:4.2.0
BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63
BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9
BuildRequires: trinity-filesystem >= %{tde_version}
Requires: trinity-arts >= %{tde_epoch}:1.5.10
Requires: trinity-filesystem >= %{tde_version}
Requires: fileshareset >= 2.0
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
# KRB5 support
BuildRequires: krb5-devel
# XSLT support
BuildRequires: libxslt-devel
BuildRequires: cups-devel
BuildRequires: openssl-devel
# ALSA support
BuildRequires: alsa-lib-devel
# IDN support
BuildRequires: libidn-devel
# CUPS support
BuildRequires: cups-devel
# TIFF support
BuildRequires: libtiff-devel
# OPENSSL support
BuildRequires: openssl-devel
# GLIB2 support
BuildRequires: glib2-devel
@ -159,7 +188,7 @@ BuildRequires: jasper-devel
# AVAHI support
%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_avahi 1
BuildRequires: trinity-avahi-tqt-devel >= 1:0.6.30
BuildRequires: libavahi-tqt-devel >= 1:0.6.30
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
Requires: %{_lib}avahi-client3
@ -185,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
@ -230,9 +247,10 @@ BuildRequires: xz-devel
%endif
%endif
# Certificates support
# Certificates support
%if 0%{?rhel} >= 6 || 0%{?fedora}
%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
BuildRequires: ca-certificates
Requires: ca-certificates
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
@ -243,6 +261,11 @@ Requires: openssl
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
Requires: openssl
%endif
%if 0%{?suse_version}
%define cacert %{_sysconfdir}/ssl/ca-bundle.pem
BuildRequires: ca-certificates
Requires: ca-certificates
%endif
# XRANDR support
# On RHEL5, xrandr library is too old.
@ -250,10 +273,24 @@ Requires: openssl
%define with_xrandr 1
%endif
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
%define xcomposite_devel %{_lib}xcomposite-devel
%else
%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
%define xcomposite_devel libXcomposite-devel
%endif
%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}}
# XT support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXt-devel
%define xt_devel libXt-devel
%endif
%{?xt_devel:BuildRequires: %{xt_devel}}
@ -279,8 +316,6 @@ kimgio (image manipulation).
%{tde_bindir}/dcopserver
%{tde_bindir}/dcopserver_shutdown
%{tde_bindir}/dcopstart
%{tde_bindir}/filesharelist
%{tde_bindir}/fileshareset
%{tde_bindir}/imagetops
%{tde_bindir}/kab2kabc
%{tde_bindir}/kaddprinterwizard
@ -309,7 +344,6 @@ kimgio (image manipulation).
%{tde_bindir}/klauncher
%{tde_bindir}/kmailservice
%{tde_bindir}/kmimelist
%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
%{tde_bindir}/ksendbugmail
%{tde_bindir}/kshell
%{tde_bindir}/kstartupconfig
@ -321,9 +355,7 @@ kimgio (image manipulation).
%{tde_bindir}/make_driver_db_lpr
%{tde_bindir}/meinproc
%{tde_bindir}/networkstatustestservice
%{tde_bindir}/start_kdeinit
%{tde_bindir}/start_kdeinit_wrapper
%attr(4755,root,root) %{tde_bindir}/kgrantpty
%{tde_bindir}/checkXML
%{tde_bindir}/ksvgtopng
%{tde_bindir}/kunittestmodrunner
@ -350,7 +382,18 @@ kimgio (image manipulation).
%{tde_tdedocdir}/HTML/en/common/*
%{tde_tdedocdir}/HTML/en/kspell/
%{_sysconfdir}/xdg/menus/tde-applications.menu
# Some setuid binaries need special care
%if 0%{?suse_version}
%verify(not mode) %{tde_bindir}/kgrantpty
%verify(not mode) %{tde_bindir}/kpac_dhcp_helper
%verify(not mode) %{tde_bindir}/start_kdeinit
%else
%attr(4755,root,root) %{tde_bindir}/kgrantpty
%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
%attr(4711,root,root) %{tde_bindir}/start_kdeinit
%endif
%config %{_sysconfdir}/xdg/menus/tde-applications.menu
%pre
# TDE Bug #1074
@ -361,14 +404,21 @@ fi
%post
/sbin/ldconfig || :
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
%set_permissions %{tde_bindir}/kgrantpty
%set_permissions %{tde_bindir}/kpac_dhcp_helper
%set_permissions %{tde_bindir}/start_kdeinit
%endif
%postun
/sbin/ldconfig || :
##########
%package devel
Summary: %{name} - Development files
Group: Development/Libraries
Summary: TDE Libraries (Development files)
Group: Development/Libraries/X11
Requires: %{name} = %{version}-%{release}
Obsoletes: tdelibs-devel < %{version}-%{release}
@ -376,6 +426,13 @@ Provides: tdelibs-devel = %{version}-%{release}
Obsoletes: trinity-kdelibs-devel < %{version}-%{release}
Provides: trinity-kdelibs-devel = %{version}-%{release}
Requires: qt3-devel >= 3.3.8d
Requires: libtqt4-devel = %{tde_epoch}:4.2.0
Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: libart_lgpl-devel
%{?xcomposite_devel:Requires: %{xcomposite_devel}}
%{?xt_devel:Requires: %{xt_devel}}
%description devel
This package includes the header files you will need to compile
applications for TDE.
@ -476,18 +533,48 @@ fi
%__rm -rf "%{?buildroot}"
%__make install DESTDIR="%{?buildroot}" -C build
# Use system-wide CA certificate
# Use system-wide CA certificates
%if "%{?cacert}" != ""
%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%endif
# Symlinks duplicate files (mostly under 'ksgmltools2')
%fdupes -s "%{?buildroot}"
# Fix 'tderesources.desktop' (openSUSE only)
%if 0%{?suse_version}
%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
%endif
# Remove setuid bit on some binaries.
chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty"
chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper"
chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit"
# fileshareset 2.0 is provided separately.
# Remove integrated fileshareset 1.0 .
%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist"
%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset"
%clean
%__rm -rf "%{?buildroot}"
%if 0%{?suse_version}
# Check permissions on setuid files (openSUSE specific)
%verifyscript
%verify_permissions -e %{tde_bindir}/kgrantpty
%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper
%verify_permissions -e %{tde_bindir}/start_kdeinit
%endif
%changelog
* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
- Remove integrated fileshareset.
- Update dependencies.
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
- Build for Fedora 19

@ -20,6 +20,7 @@
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_epoch 1
%define tde_version 3.5.13.2
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin

Loading…
Cancel
Save