rpms/libast/devel libast-wrapper.h,NONE,1.1 libast.spec,1.2,1.3

[Terje Røsten (terjeros)]

Author: terjeros

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

Modified Files:
	libast.spec 
Added Files:
	libast-wrapper.h 
Log Message:
* Sat Jan 20 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.7.1-0.3.20060818cvs
- Fix multiarch stuff
- Some style cleanup



--- NEW FILE libast-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will occur because <HEADER>.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "<HEADER>-i386.h"
#elif defined(__ia64__)
#include "<HEADER>-ia64.h"
#elif defined(__powerpc64__)
#include "<HEADER>-ppc64.h"
#elif defined(__powerpc__)
#include "<HEADER>-ppc.h"
#elif defined(__s390x__)
#include "<HEADER>-s390x.h"
#elif defined(__s390__)
#include "<HEADER>-s390.h"
#elif defined(__x86_64__)
#include "<HEADER>-x86_64.h"
#else
#error "This libast-devel package does not work your architecture?"
#endif



Index: libast.spec
===================================================================
RCS file: /cvs/extras/rpms/libast/devel/libast.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libast.spec	28 Aug 2007 07:59:26 -0000	1.2
+++ libast.spec	21 Jan 2008 08:07:27 -0000	1.3
@@ -1,12 +1,17 @@
+# Arches on which the multilib {sysdefs,types}.h hack is needed:
+# (Update libast-wrapper.h when adding archs)
+%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+
 Summary: Library of Assorted Spiffy Things
-Name: libast
+Name:    libast
 Version: 0.7.1
-Release: 0.2.20060818cvs%{?dist}
-Group: System Environment/Libraries
+Release: 0.3.20060818cvs%{?dist}
+Group:   System Environment/Libraries
 License: BSD
-URL: http://www.eterm.org/
-Source: http://www.eterm.org/download/%{name}-%{version}.tar.gz
-BuildRequires: imlib2-devel
+URL:     http://www.eterm.org/
+Source:  http://www.eterm.org/download/%{name}-%{version}.tar.gz
+Source1: libast-wrapper.h
+BuildRequires: imlib2-devel pcre-devel libXt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,8 +24,8 @@
 version number that begins with 0.
 
 %package devel
-Summary: Header files, libraries and development documentation for %{name}
-Group: Development/Libraries
+Summary:  Header files, libraries and development documentation for %{name}
+Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -36,32 +41,49 @@
 %{__make} %{?_smp_mflags}
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-%makeinstall
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+
+# Fix multiarch stuff
+%ifarch %{multilib_arches}
+for header in sysdefs types ; do
+    mv %{buildroot}%{_includedir}/%{name}/$header.h \
+       %{buildroot}%{_includedir}/%{name}/$header-%{_arch}.h
+    %{__install} -m 0644 -c %{SOURCE1} %{buildroot}%{_includedir}/%{name}/$header.h
+    %{__sed} -i -e 's/<HEADER>/'$header'/g' %{buildroot}%{_includedir}/%{name}/$header.h
+    touch -r ChangeLog %{buildroot}%{_includedir}/%{name}/$header.h
+done
+%{__sed} -i -e '/^LDFLAGS=/d' %{buildroot}%{_bindir}/%{name}-config
+touch -r ChangeLog %{buildroot}%{_bindir}/%{name}-config
+%endif
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %doc ChangeLog DESIGN README LICENSE
-%{_libdir}/libast.so.*
+%{_libdir}/%{name}.so.*
 
 %files devel
-%defattr(-, root, root, 0755)
-%dir %{_includedir}/libast
-%{_bindir}/libast-config
-%{_libdir}/libast.so
-%{_includedir}/libast.h
-%{_includedir}/libast/*.h
-%{_datadir}/aclocal/libast.m4
+%defattr(-, root, root, -)
+%dir %{_includedir}/%{name}
+%{_bindir}/%{name}-config
+%{_libdir}/%{name}.so
+%{_includedir}/%{name}.h
+%{_includedir}/%{name}/*.h
+%{_datadir}/aclocal/%{name}.m4
 %exclude %{_libdir}/*.la
 %exclude %{_libdir}/*.a
 
 %changelog
+* Sat Jan 20 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.7.1-0.3.20060818cvs
+- Fix multiarch stuff
+- Some style cleanup
+
 * Tue Aug 28 2007 Terje Røsten <terje.rosten at ntnu.no> - 0.7.1-0.2.20060818cvs
 - Rebuild