Fedora & EPEL: simplify macros, better macros around latex, java dependency only...

diff --git a/emi.canl.canl-c/project/canl-c.spec b/emi.canl.canl-c/project/canl-c.spec
index 7a14e58..4da63d8 100644 (file)
--- a/emi.canl.canl-c/project/canl-c.spec
+++ b/emi.canl.canl-c/project/canl-c.spec
@@ -1,5 +1,3 @@
-%global is_fedora %(rpm -q --quiet fedora-release && echo 1 || echo 0)
-
 Name:           canl-c
 Version:        @MAJOR@.@MINOR@.@REVISION@
 Release:        @AGE@%{?dist}
@@ -20,8 +18,8 @@ BuildRequires:  krb5-devel%{?_isa}
 BuildRequires:  libtool
 BuildRequires:  openssl-devel%{?_isa}
 BuildRequires:  pkgconfig
-%if %is_fedora
-BuildRequires:  texlive-latex
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:  tex(latex)
 %else
 BuildRequires:  tetex-latex
 %endif

diff --git a/org.glite.jobid.api-java/project/glite-jobid-api-java.spec b/org.glite.jobid.api-java/project/glite-jobid-api-java.spec
index 0ca3758..00dcf52 100644 (file)
--- a/org.glite.jobid.api-java/project/glite-jobid-api-java.spec
+++ b/org.glite.jobid.api-java/project/glite-jobid-api-java.spec
@@ -1,5 +1,3 @@
-%global distver %(rpm -q --quiet redhat-release && rpm -q --queryformat "%{VERSION}" redhat-release || rpm -q --quiet centos-release && rpm -q --queryformat "%{VERSION}" centos-release || rpm -q --quiet sl-release && rpm -q --queryformat "%{VERSION}" sl-release | sed 's/^\\([0-9]*\\).*/\\1/')
-
 Name:           glite-jobid-api-java
 Version:        @MAJOR@.@MINOR@.@REVISION@
 Release:        @AGE@%{?dist}
@@ -15,11 +13,7 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  jakarta-commons-codec
-%if 0%{?distver} >= 6
-BuildRequires:  java-1.6.0-openjdk-devel%{?_isa}
-%else
 BuildRequires:  java-devel
-%endif
 Requires:       jakarta-commons-codec
 
 %description

diff --git a/org.glite.lb.client-java/project/glite-lb-client-java.spec b/org.glite.lb.client-java/project/glite-lb-client-java.spec
index d9af3ae..f27c5c2 100644 (file)
--- a/org.glite.lb.client-java/project/glite-lb-client-java.spec
+++ b/org.glite.lb.client-java/project/glite-lb-client-java.spec
@@ -1,5 +1,3 @@
-%global distver %(rpm -q --quiet redhat-release && rpm -q --queryformat "%{VERSION}" redhat-release || rpm -q --quiet centos-release && rpm -q --queryformat "%{VERSION}" centos-release || rpm -q --quiet sl-release && rpm -q --queryformat "%{VERSION}" sl-release | sed 's/^\\([0-9]*\\).*/\\1/')
-
 Name:           glite-lb-client-java
 Version:        @MAJOR@.@MINOR@.@REVISION@
 Release:        @AGE@%{?dist}
@@ -25,11 +23,7 @@ BuildRequires:  glite-jobid-api-java
 BuildRequires:  glite-lb-types
 BuildRequires:  glite-lb-ws-interface
 BuildRequires:  jakarta-commons-lang
-%if 0%{?distver} >= 6
-BuildRequires:  java-1.6.0-openjdk-devel
-%else
 BuildRequires:  java-devel
-%endif
 BuildRequires:  libtool
 Requires:       emi-trustmanager-axis
 Requires:       emi-trustmanager

diff --git a/org.glite.lb.doc/project/glite-lb-doc.spec b/org.glite.lb.doc/project/glite-lb-doc.spec
index 6dbe233..3297076 100644 (file)
--- a/org.glite.lb.doc/project/glite-lb-doc.spec
+++ b/org.glite.lb.doc/project/glite-lb-doc.spec
@@ -1,5 +1,3 @@
-%global is_fedora %(rpm -q --quiet fedora-release && echo 1 || echo 0)
-
 Name:           glite-lb-doc
 Version:        @MAJOR@.@MINOR@.@REVISION@
 Release:        @AGE@%{?dist}
@@ -13,8 +11,8 @@ Source:         http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lb.doc
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
-%if %is_fedora
-BuildRequires:  texlive-latex
+%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:  tex(latex)
 %else
 BuildRequires:  tetex-latex
 %endif