From a615d19df88eb2e989316b480519161945dbc7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Nov 2018 21:34:48 +0100 Subject: RPM: merge redhat directory with master branch --- .../dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec | 30 +++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec') 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 8ecd7f82c..c9e7121e6 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 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables @@ -29,7 +29,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ @@ -54,9 +54,26 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# GLIB2 support +BuildRequires: glib2-devel + # GETTEXT support BuildRequires: gettext-devel +# Xi support +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: libxi-devel +%endif +%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} +BuildRequires: libXi-devel +%endif +%if 0%{?suse_version} == 1140 +BuildRequires: libXi6-devel +%endif + # DBUS support %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -70,7 +87,7 @@ BuildRequires: libcap-devel # AVAHI support %if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel %{_lib}avahi-client-devel +%define avahi_devel libavahi-client-devel %endif %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} %define avahi_devel avahi-devel @@ -176,7 +193,7 @@ into a TQt main loop application. ########## -%if 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -226,8 +243,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Sat Oct 11 2014 Francois Andriot - 1:0.6.30-2 -- Rename package to 'libavahi-tqt' - -* Mon Jun 03 2013 Francois Andriot - 1:0.6.30-1 -- Initial release for TDE 3.5.13.2 -- cgit v1.2.1