summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-09-30 16:13:17 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-09-30 16:13:17 +0200
commitbfa5b7797ea656f89abb783a98947e439971df95 (patch)
tree8e4b70081eb820f4e76e2705b225efc736467344
parentd2ab64a15ec2db5aa32ab2fbd6e55b44dd0a5500 (diff)
downloadtde-packaging-bfa5b7797ea656f89abb783a98947e439971df95.tar.gz
tde-packaging-bfa5b7797ea656f89abb783a98947e439971df95.zip
RPM Packaging: update TQT3
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec23
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec151
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec46
3 files changed, 154 insertions, 66 deletions
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 890186556..2bc270c1d 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -1,11 +1,28 @@
+#
+# spec file for package arts
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# 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/
+#
+
# 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 variables
%define tde_version 14.0.0
%define tde_prefix /opt/trinity
-
%define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
@@ -33,7 +50,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kcmartsrc-pulseaudio
-BuildRequires: trinity-tqtinterface-devel >= 1:4.2.0-1
+BuildRequires: libtqt4-devel >= 1:4.2.0
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
@@ -96,7 +113,7 @@ BuildRequires: libmad-devel
%define with_pulseaudio 1
%endif
-Requires: trinity-tqtinterface >= 1:4.2.0-1
+Requires: libtqt4 >= 1:4.2.0
Requires: audiofile
%if "%{?tde_prefix}" == "/usr"
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 99f4c20bc..16892edb1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -1,30 +1,47 @@
+#
+# spec file for package avahi-tqt
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# 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 specific building variables
%define tde_version 14.0.0
-%define tde_prefix /usr
+%define tde_prefix /opt/trinity
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-
Name: trinity-avahi-tqt
Epoch: 2
Version: 0.6.30
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License: GPL
-Summary: Avahi TQT Interface
-Group: System Environment/Libraries
+License: LGPL-2.0+
+Summary: Avahi TQt integration library
+Group: System/Libraries
Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
+#Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{tde_prefix}
+Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: gcc-c++
BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires: trinity-tqtinterface-devel >= 1:4.2.0-1
+
+BuildRequires: gcc-c++
BuildRequires: gettext-devel
BuildRequires: libtool
@@ -39,7 +56,6 @@ BuildRequires: dbus-devel
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
-Provides: %{_lib}avahi-qt3
%endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
BuildRequires: avahi-devel
@@ -54,36 +70,100 @@ BuildRequires: libexpat-devel
%endif
Requires: trinity-tqt3 >= 3.5.0
-Requires: trinity-tqtinterface >= %{tde_version}
+Requires: trinity-tqtinterface >= 1:4.2.0-1
+
+%description
+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.
+
+##########
-Obsoletes: avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+%package -n libavahi-tqt
+Summary: Avahi TQt integration library
+Group: System/Libraries
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Provides: %{_lib}avahi-qt3
+%endif
+
+Obsoletes: avahi-tqt
Provides: avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-avahi-tqt
+Provides: trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n libavahi-tqt
+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
+/sbin/ldconfig || :
+%postun -n libavahi-tqt
+/sbin/ldconfig || :
-%description
-Avahi TQT Interface
+%files -n libavahi-tqt
+%defattr(-,root,root,-)
+%{_libdir}/libavahi-tqt.so.1
+%{_libdir}/libavahi-tqt.so.1.0.0
+##########
-%package devel
-Summary: %{name} - Development files
+%package -n libavahi-tqt-devel
+Summary: Avahi TQt integration library (Development Files)
Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: %{_lib}avahi-qt3-devel
%endif
-Obsoletes: avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: avahi-tqt-devel
Provides: avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-avahi-tqt-devel
+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 || :
+
+%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}
%debug_package
%endif
+##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -95,9 +175,9 @@ unset QTDIR QTINC QTLIB
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 \
@@ -116,30 +196,7 @@ 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
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.30-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.30-1
- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 0b04aa33b..a2010fa4c 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -1,3 +1,20 @@
+#
+# spec file for package tqtinterface
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# 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 specific building variables
%define tde_version 14.0.0
%define tde_prefix /opt/trinity
@@ -13,8 +30,6 @@ Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL-2.0+
Summary: The Trinity Qt Interface Libraries
Group: System/GUI/Other
-
-Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
#Packager: Francois Andriot <francois.andriot@free.fr>
@@ -22,21 +37,15 @@ Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-# This is a metapackage that depends on the following package
-Requires: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
-
-BuildRequires: cmake >= 2.8
-BuildRequires: gcc-c++
-BuildRequires: pkgconfig
-
-BuildRequires: trinity-tqt3-devel >= 3.5.0
-Requires: trinity-tqt3 >= 3.5.0
+BuildRequires: libtqt3-mt-devel >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
BuildRequires: trinity-cmake-macros
-Requires: trinity-cmake-macros
%endif
+BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
# PTHREAD support
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@@ -85,6 +94,11 @@ Group: System/GUI/Other
Summary: The Trinity Qt Interface Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: libtqt3-mt >= 3.5.0
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires: trinity-cmake-macros
+%endif
+
Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -108,10 +122,10 @@ although some code has been added for useful functions that are no longer part o
##########
%package -n libtqt4-devel
-Group: Development/Libraries/Other
+Group: Development/Libraries
Summary: The Trinity Qt Interface Libraries (Development Files)
Requires: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: trinity-tqt3-devel >= 3.5.0
+Requires: libtqt3-mt-devel >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
Requires: trinity-cmake-macros
@@ -155,7 +169,7 @@ although some code has been added for useful functions that are no longer part o
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
%debug_package
%endif
@@ -218,5 +232,5 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1:4.2.0-1
- Initial release for TDE 14.0.0