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

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	xbae.spec 
Log Message:
* Sat May 12 2007 Patrice Dumas <pertusus at free.fr> 4.60.4-6
- keep timestamps
- examples/builderXcessory is arch specific



Index: xbae.spec
===================================================================
RCS file: /cvs/extras/rpms/xbae/devel/xbae.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xbae.spec	10 Dec 2006 11:38:59 -0000	1.4
+++ xbae.spec	23 May 2007 22:12:22 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xbae
 Version:        4.60.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Motif matrix, caption and text input widgets
 Group:          System Environment/Libraries
 License:        BSD
@@ -9,11 +9,11 @@
 # 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)
 
 # libXp-devel and libXext-devel are required by openmotif-devel or
 # lesstif-devel
-# Wcl-devel is only needed by an example, which adds the Xbae widgets to Wcl
 BuildRequires:  libXpm-devel 
 #BuildRequires:  openmotif-devel
 BuildRequires:  lesstif-devel
@@ -65,6 +65,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1 -b .multilib
 
 
 %build
@@ -74,29 +75,50 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL='install -p'
+# fix timestamps for configure generated man pages
+pushd src
+for file in XbaeCaption.3 XbaeInput.3 XbaeMatrix.3; do
+  touch -r $file.in $RPM_BUILD_ROOT%{_mandir}/man3/$file
+done
+popd
+# and include file
+touch -r NEWS $RPM_BUILD_ROOT%{_includedir}/Xbae/patchlevel.h
 
 # the configure test doesn't find the aclocal dir, so we install
 # the .m4 file by hand
 install -d -m755 $RPM_BUILD_ROOT%{_datadir}/aclocal
-install -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
+install -p -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la
+
+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
+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
+make -C __fedora_examples clean
+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
+mv __fedora_examples/builderXcessory/README __fedora_Xbae-docs/examples/builderXcessory-%{_arch}/
+# this is a duplicate
+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
+mv __fedora_examples __fedora_code_examples/code_examples
 
-mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ Xbae-docs
-# remove duplicate files
-rm Xbae-docs/README
-rm Xbae-docs/NEWS
-
-# clean the examples
-make -C examples clean
-cp -pr examples code_examples
-find code_examples -name '*akefile*' -exec rm {} \;
-rm code_examples/extest
-rm code_examples/testall
-mv code_examples/builderXcessory/README Xbae-docs/examples/builderXcessory/
-rm -rf code_examples/builderXcessory/
-ln -s ../examples/builderXcessory/ code_examples/builderXcessory
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,17 +132,22 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS COPYING README
-%{_libdir}/*.so.*
+%{_libdir}/libXbae.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc Xbae-docs/* code_examples
+%doc __fedora_Xbae-docs/* __fedora_code_examples/code_examples
 %{_includedir}/Xbae/
-%{_libdir}/*.so
+%{_libdir}/libXbae.so
 %{_mandir}/man*/Xbae*
 %{_datadir}/aclocal/*
 
+
 %changelog
+* Sat May 12 2007 Patrice Dumas <pertusus at free.fr> 4.60.4-6
+- keep timestamps
+- examples/builderXcessory is arch specific
+
 * Sun Dec 10 2006 Patrice Dumas <pertusus at free.fr> 4.60.4-5
 - Requires automake is for -devel (#219047)