rpms/xbae/devel xbae.spec,1.5,1.6

[Patrice Dumas (pertusus) <fedora-extras-commits redhat com>]

Author: pertusus

Update of /cvs/extras/rpms/xbae/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5103

Modified Files:
	xbae.spec 
Log Message:
* Wed Jul 25 2007 Patrice Dumas <pertusus free fr> 4.60.4-7
- add rhel conditionals



Index: xbae.spec
===================================================================
RCS file: /cvs/extras/rpms/xbae/devel/xbae.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xbae.spec	23 May 2007 22:12:22 -0000	1.5
+++ xbae.spec	1 Aug 2007 10:51:00 -0000	1.6
@@ -1,35 +1,55 @@
+# xbae wasn't in fedora with monolithic X (fedora < 5), but it 
+# could be possible to do the needed conditionals
+# motif switched to lesstif in fedora 6 and fedora extras 5 is not 
+# maintained anymore, it could be possible to add the conditionals
+%if 0%{?rhel}
+%if "%rhel" <= "4"
+%define monolithic_X 1
+%endif
+%endif
+
 Name:           xbae
 Version:        4.60.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Motif matrix, caption and text input widgets
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://xbae.sourceforge.net/
-Source0:        http://ovh.dl.sourceforge.net/sourceforge/xbae/xbae-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net//xbae/xbae-%{version}.tar.gz
 # this fixes the link of the example using Wcl, it shouldn't be of use
 # now that Wcl isn't buildrequired, but it is still better.
 Patch0:         xbae-link_Mri_with_lXmp.diff
 Patch1:         xbae-4.60.4-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?monolithic_X}
+# this could certainly be left out since it is an openmotif-devel 
+# dependency, but it is also a direct dependency
+BuildRequires:  xorg-x11-devel
+%else
 # libXp-devel and libXext-devel are required by openmotif-devel or
 # lesstif-devel
 BuildRequires:  libXpm-devel 
-#BuildRequires:  openmotif-devel
+# needed for examples
+BuildRequires:  libXmu-devel
+%endif
+
+%if 0%{?rhel}
+BuildRequires:  openmotif-devel
+%else
 BuildRequires:  lesstif-devel
+# to be sure that we link against lesstif even if openmotif provides the same
+# soname
+Requires:       lesstif
+%endif
 # Wcl-devel should only needed by an example, which adds the Xbae widgets 
 # to Wcl, so there is no real need for it.
 #BuildRequires:  Wcl-devel
-# needed for examples
-BuildRequires:  libXmu-devel
 
 # name with capitalized X was used for the xbae package shipped up to FC-1
 Provides:       Xbae = %{version}-%{release}
 Obsoletes:      Xbae < %{version}-%{release}
 
-# to be sure that we link against lesstif even if openmotif provides the same
-# soname
-Requires:       lesstif
 
 %description
 XbaeMatrix is a free Motif(R) table widget (also compatible with the free 
@@ -49,9 +69,16 @@
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-#Requires:       openmotif-devel 
+%if 0%{?rhel}
+Requires:       openmotif-devel 
+%else
 Requires:       lesstif-devel 
+%endif
+%if 0%{?monolithic_X}
+Requires:       xorg-x11-devel
+%else
 Requires:       libXpm-devel
+%endif
 # for the aclocal directory
 Requires:       automake
 Provides:       Xbae-devel = %{version}-%{release}
@@ -92,16 +119,17 @@
 
 rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la
 
+# prepare the main docs
+# Use systematically __fedora_* to avoid directory name clash.
 rm -rf __fedora_Xbae-docs
 mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __fedora_Xbae-docs
 # remove duplicate files already in %%doc
 rm __fedora_Xbae-docs/README
 rm __fedora_Xbae-docs/NEWS
-# examples for builderXcessory are arch specific
+# examples for builderXcessory are arch specific, this avoids clash of
+# doc files between arches
 mv __fedora_Xbae-docs/examples/builderXcessory __fedora_Xbae-docs/examples/builderXcessory-%{_arch}
 
-# clean the examples. Use systematically __fedora_* to avoid directory
-# name clash.
 # first clean examples
 rm -rf __fedora_examples
 cp -pr examples __fedora_examples
@@ -109,11 +137,15 @@
 find __fedora_examples -name '*akefile*' -exec rm {} \;
 rm __fedora_examples/extest
 rm __fedora_examples/testall
-# it is better with the main examples doc, not in code examples
+
+# the builderXcessory directory is duplicated in the main doc and in the
+# example code. The master dir is considered to be in the main doc.
+# the README is better with the main examples doc, not in code examples
 mv __fedora_examples/builderXcessory/README __fedora_Xbae-docs/examples/builderXcessory-%{_arch}/
-# this is a duplicate
+# remove the duplicate dir and replace it with a link
 rm -rf __fedora_examples/builderXcessory/
 ln -s ../examples/builderXcessory-%{_arch}/ __fedora_examples/builderXcessory-%{_arch}
+
 # then put the examples in a code_examples directory
 rm -rf __fedora_code_examples
 mkdir __fedora_code_examples
@@ -144,6 +176,9 @@
 
 
 %changelog
+* Wed Jul 25 2007 Patrice Dumas <pertusus free fr> 4.60.4-7
+- add rhel conditionals
+
 * Sat May 12 2007 Patrice Dumas <pertusus free fr> 4.60.4-6
 - keep timestamps
 - examples/builderXcessory is arch specific