RPM Packaging: update 3.5.13.2 packages

1 files changed, 159 insertions, 70 deletions

diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
index dbfe6c2d7..8ecd7f82c 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
@@ -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