Updated RPM dependencies

Moved the RPM dependencies to the binary packages and added an RPM build
dependency on gettext-tools for SUSE

diff --git a/rpm/hylafax.spec b/rpm/hylafax.spec
index 5d3857869f7f8d8188173fd9b2606957eac3799b..36f72dfb32b3b8884abb2f4455a5c4630c36b11c 100644 (file)
--- a/rpm/hylafax.spec
+++ b/rpm/hylafax.spec
@@ -1,6 +1,6 @@
 %define name        hylafax
 %define version     6.1
-%define pkg_release 0.1.GIT
+%define pkg_release 0.2.GIT
 
 #
 ## OS version detection
@@ -60,15 +60,10 @@ URL:       http://www.ifax.com/
 Source:    ftp://ftp.hylafax.org/source/%{name}-%{version}.tar.gz
 
 BuildPrereq: libjpeg-devel, libtiff-devel, zlib-devel, gettext
-Requires:    ghostscript >= 5.5
-Requires:    libtiff >= 3.5.5
 %if %{is_suse}
-Requires:    tiff >= 3.5.5
+BuildPrereq: gettext-tools
 %endif
-Requires:    gawk
-Requires:    rpm >= 3.0.5
-Requires:    sharutils
-Conflicts:   mgetty-sendfax
+BuildPrereq: rpm >= 3.0.5
 
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -87,7 +82,15 @@ Group:     Applications/Communications
 
 Provides:    hylafax = %{version}-%{pkg_release}%{ostag}
 Requires:    hylafax-client = %{version}-%{pkg_release}%{ostag}
+Requires:    ghostscript >= 5.5
+Requires:    libtiff >= 3.5.5
+%if %{is_suse}
+Requires:    tiff >= 3.5.5
+%endif
+Requires:    gawk
+Requires:    sharutils
 Obsoletes:   hylafax < 6.0.0 hylafax > 20000101:4.0.0
+Conflicts:   mgetty-sendfax
 
 %description server
 HylaFAX(tm) is a sophisticated enterprise-strength fax package for
@@ -102,7 +105,10 @@ Summary:   HylaFAX(tm) is a sophisticated enterprise strength fax package
 Release:   %{pkg_release}%{ostag}
 Group:     Applications/Communications
 
+Requires:    ghostscript >= 5.5
+Requires:    libtiff >= 3.5.5
 Obsoletes:   hylafax < 6.0.0 hylafax > 20000101:4.0.0
+Conflicts:   mgetty-sendfax
 
 %description client
 HylaFAX(tm) is a sophisticated enterprise-strength fax package for
@@ -449,6 +455,10 @@ fi
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/hylafax/typerules
 
 %changelog
+* Fri Sep 25 2009 Patrice Fournier <patrice.fournier@ifax.com> 6.1-0.2.GIT
+  - Move the require dependencies to the right binary packages
+  - Add gettext-tools build dependency on SUSE
+
 * Fri Jul 31 2009 Patrice Fournier <patrice.fournier@ifax.com> 6.1-0.1.GIT
   - Update to 6.1 GIT branch