Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

3 files changed, 42 insertions, 345 deletions

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 03bc7e825..42c73bff1 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -15,11 +15,15 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# TDE specific building variables
+# TDE variables
 %define tde_version 14.0.0
-%define tde_prefix /opt/trinity
-%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:		2
@@ -43,8 +47,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt3-mt-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -53,9 +56,6 @@ BuildRequires:	libtool
 # GETTEXT support
 BuildRequires:	gettext-devel
 
-# GLIB2 support
-BuildRequires:	glib2-devel
-
 # DBUS support
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
@@ -64,7 +64,7 @@ BuildRequires:	dbus-1-devel
 BuildRequires:	dbus-devel
 %endif
 
-# AVAHI support
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 %endif
@@ -72,7 +72,7 @@ BuildRequires:	%{_lib}avahi-client-devel
 BuildRequires:	avahi-devel
 %endif
 
-# EXPAT support
+# EXPAT support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
@@ -80,12 +80,15 @@ BuildRequires:	expat-devel
 BuildRequires:	libexpat-devel
 %endif
 
-# UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
-BuildRequires: libuuid-devel
+# NAS support
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_nas 1
+BuildRequires: nas-devel
 %endif
-%if 0%{?rhel} == 5
-BuildRequires: e2fsprogs-devel
+
+# XT support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires: libXt-devel
 %endif
 
 %description
@@ -100,18 +103,15 @@ into a TQt main loop application.
 
 ##########
 
-%package -n libavahi-tqt
+%package -n %{libavahi}-tqt1
 Summary:	Avahi TQt integration library
 Group:		System/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3
-%endif
+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-tqt
+%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
@@ -121,32 +121,39 @@ 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
+%post -n %{libavahi}-tqt1
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt
+%postun -n %{libavahi}-tqt1
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt
+%files -n %{libavahi}-tqt1
 %defattr(-,root,root,-)
 %{_libdir}/libavahi-tqt.so.1
 %{_libdir}/libavahi-tqt.so.1.0.0
 
 ##########
 
-%package -n libavahi-tqt-devel
+%package -n %{libavahi}-tqt-devel
 Summary:	Avahi TQt integration library (Development Files)
-Group:		Development/Libraries
-Requires:	libavahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Group:		Development/Libraries/C and C++
+Provides:	libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
+Requires:	%{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt4-devel >= 2:4.2.0
 
 Obsoletes:		trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n libavahi-tqt-devel
+# AVAHI support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	%{_lib}avahi-client-devel
+%endif
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
+Requires:	avahi-devel
+%endif
+
+%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
@@ -156,13 +163,13 @@ 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
+%post -n %{libavahi}-tqt-devel
 /sbin/ldconfig || :
 
-%postun -n libavahi-tqt-devel
+%postun -n %{libavahi}-tqt-devel
 /sbin/ldconfig || :
 
-%files -n libavahi-tqt-devel
+%files -n %{libavahi}-tqt-devel
 %defattr(-,root,root,-)
 %{_includedir}/avahi-tqt/
 %{_libdir}/libavahi-tqt.so
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
deleted file mode 100644
index 81652edf4..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-
-Name:		trinity-avahi-tqt
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Avahi TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	avahi-tqt-3.5.13.1.tar.gz
-
-BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-BuildRequires:	tqtinterface-devel >= 3.5.13.1
-BuildRequires:	gettext-devel
-BuildRequires:	libtool
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
-Provides:		%{_lib}avahi-qt3
-%else
-BuildRequires:	avahi-devel
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
-BuildRequires:	expat-devel
-%endif
-%endif
-
-Requires:		qt3
-Requires:		trinity-tqtinterface >= 3.5.13
-
-Obsoletes:		avahi-tqt < %{version}-%{release}
-Provides:		avahi-tqt = %{version}-%{release}
-
-
-%description
-Avahi TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
-
-Obsoletes:		avahi-tqt-devel < %{version}-%{release}
-Provides:		avahi-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n avahi-tqt-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
-
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
-
-%configure \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
-  --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system  \
-  MOC_QT3=%{tde_bindir}/moc-tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
deleted file mode 100644
index 41772b84d..000000000
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-
-Name:		trinity-avahi-tqt
-Version:	3.5.13
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	Avahi TQT Interface
-Group:		System Environment/Libraries
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	avahi-tqt-3.5.13.tar.gz
-
-BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-BuildRequires:	tqtinterface-devel >= 3.5.13
-BuildRequires:	gettext-devel
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-devel
-%else
-BuildRequires:	dbus-devel
-%endif
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}avahi-client-devel
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
-Provides:		%{_lib}avahi-qt3
-%else
-BuildRequires:	avahi-devel
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
-BuildRequires:	expat-devel
-%endif
-%endif
-
-Requires:		qt3
-Requires:		tqtinterface >= 3.5.13
-
-Obsoletes:		avahi-tqt < %{version}-%{release}
-Provides:		avahi-tqt = %{version}-%{release}
-
-%description
-Avahi TQT Interface
-
-
-%package devel
-Requires:	%{name}
-Summary:	%{name} - Development files
-Group:		Development/Libraries
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-Provides:		%{_lib}avahi-qt3-devel
-%endif
-
-Obsoletes:		avahi-tqt-devel < %{version}-%{release}
-Provides:		avahi-tqt-devel = %{version}-%{release}
-
-%description devel
-Development files for %{name}
-
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n dependencies/avahi-tqt
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i "acinclude.m4" \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "./ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "./ltmain.sh"
-
-# Removes stale libtool stuff
-%__rm -f common/libtool.m4 common/ltoptions.m4 common/lt~obsolete.m4 common/ltsugar.m4 common/ltversion.m4
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir} -I%{tde_includedir}/tqt"
-export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
-
-./autogen.sh
-
-%configure \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_docdir} \
-  --includedir=%{tde_includedir} \
-  --libdir=%{tde_libdir} \
-  --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system  \
-  MOC_QT3=%{tde_bindir}/moc-tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-# Removes '.a' file
-%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
-
-%clean
-%__rm -rf %{?buildroot}
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-%files
-%{tde_libdir}/libavahi-tqt.so.1
-%{tde_libdir}/libavahi-tqt.so.1.0.0
-
-%files devel
-%{tde_includedir}/avahi-tqt/
-%{tde_libdir}/libavahi-tqt.so
-%{tde_libdir}/libavahi-tqt.la
-%{tde_libdir}/pkgconfig/avahi-tqt.pc
-
-%changelog
-* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial release for TDE 3.5.13