RPM Packaging: update packages for 3.5.13.2 under Fedora 19

1 files changed, 34 insertions, 53 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 0cf7032cc..cd59347e4 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,18 +1,13 @@
-# 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
+# TDE specific building variables
+%define tde_version 3.5.13.2
+%define tde_prefix /usr
 %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.2
+Epoch:		1
+Version:	0.6.30
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Avahi TQT Interface
@@ -25,43 +20,42 @@ URL:		http://www.trinitydesktop.org/
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	gcc-c++
-BuildRequires:	cmake >= 2.8
-BuildRequires:	qt3-devel
-BuildRequires:	tqtinterface-devel >= 3.5.13.1
+BuildRequires:	qt3-devel >= 3.3.8d
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 %if 0%{?suse_version}
 BuildRequires:	dbus-1-devel
-%else
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	dbus-devel
 %endif
 
+# AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
-%if 0%{?pclinuxos}
-BuildRequires:	libexpat-devel
-%else
-# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
-BuildRequires:	%{_lib}expat%{?mgaversion:1}-devel
-%endif
 Provides:		%{_lib}avahi-qt3
-%else
+%endif
+%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 BuildRequires:	avahi-devel
-%if 0%{?suse_version}
-BuildRequires:	libexpat-devel
-%else
+%endif
+
+# EXPAT support
+%if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libexpat-devel
 %endif
 
-Requires:		qt3
-Requires:		trinity-tqtinterface >= 3.5.13
+Requires:		qt3 >= 3.3.8d
+Requires:		trinity-tqtinterface >= %{tde_version}
 
-Obsoletes:		avahi-tqt < %{version}-%{release}
-Provides:		avahi-tqt = %{version}-%{release}
+Obsoletes:		avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
@@ -69,16 +63,16 @@ Avahi TQT Interface
 
 
 %package devel
-Requires:	%{name}
 Summary:	%{name} - Development files
 Group:		Development/Libraries
+Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Provides:		%{_lib}avahi-qt3-devel
 %endif
 
-Obsoletes:		avahi-tqt-devel < %{version}-%{release}
-Provides:		avahi-tqt-devel = %{version}-%{release}
+Obsoletes:		avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description devel
 Development files for %{name}
@@ -90,45 +84,32 @@ Development files for %{name}
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
-# 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"
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+./autogen.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} \
+  \
+  --disable-static \
+  --disable-dependency-tracking \
+  \
   --enable-compat-libdns_sd \
-  --with-systemdsystemunitdir=/lib/systemd/system  \
-  MOC_QT3=%{tde_bindir}/moc-tqt
+  --with-systemdsystemunitdir=/lib/systemd/system
 
 %__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}