rpms/libsigsegv/EL-5 sigsegv-wrapper.h, NONE, 1.1 .cvsignore, 1.5, 1.6 libsigsegv.spec, 1.12, 1.13 sources, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/libsigsegv/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9119

Modified Files:
	.cvsignore libsigsegv.spec sources 
Added Files:
	sigsegv-wrapper.h 
Log Message:
sync w/devel



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

#if defined(__x86_64__)
#include "sigsegv-x86_64.h"
#elif defined(__i386__)
#include "sigsegv-i386.h"
#elif defined(__powerpc64__)
#include "sigsegv-ppc64.h"
#elif defined(__powerpc__)
#include "sigsegv-ppc.h"
#elif defined(__s390x__)
#include "sigsegv-s390x.h"
#elif defined(__s390__)
#include "sigsegv-s390.h"
#elif defined(__sparc64__)
#include "sigsegv-sparc64.h"
#elif defined(__sparc__)
#include "sigsegv-sparc.h"
#else
#error "This libsigsegv-devel package does not work your architecture?"
#endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Jul 2006 11:34:31 -0000	1.5
+++ .cvsignore	15 Aug 2008 17:59:55 -0000	1.6
@@ -1,2 +1 @@
-libsigsegv-2.3.tar.gz
 libsigsegv-2.4.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/EL-5/libsigsegv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsigsegv.spec	29 Aug 2006 18:38:18 -0000	1.12
+++ libsigsegv.spec	15 Aug 2008 17:59:55 -0000	1.13
@@ -1,32 +1,43 @@
 
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.4
-Release: 2%{?dist}
+Release: 6%{?dist}
 
-License: GPL
+License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
+Source0: http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1: sigsegv-wrapper.h
+
 %description
 This is a library for handling page faults in user mode. A page fault
 occurs when a program tries to access to a region of memory that is
 currently not available. Catching and handling a page fault is a useful
 technique for implementing:
-  - pageable virtual memory,
-  - memory-mapped access to persistent databases,
-  - generational garbage collectors,
-  - stack overflow handlers,
-  - distributed shared memory,
+  - pageable virtual memory
+  - memory-mapped access to persistent databases
+  - generational garbage collectors
+  - stack overflow handlers
+  - distributed shared memory
 
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %description devel
-Libraries and header files for %{name} development.
+%{summary}.
+
+%package static
+Summary: Static libraries for %{name}
+Group:   Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+%description static
+%{summary}.
 
 
 %prep
@@ -42,14 +53,21 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
+
+make install DESTDIR=%{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%ifarch %{multilib_arches}
+# hack to allow parallel installation on 32-bit and 64-bit
+  mv  %{buildroot}%{_includedir}/sigsegv.h \
+      %{buildroot}%{_includedir}/sigsegv-%{_arch}.h
+  install -p -m644 %{SOURCE1}  %{buildroot}%{_includedir}/sigsegv.h
+%endif
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
-%check || :
+%check
 make check
 
 
@@ -59,22 +77,38 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot} 
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS README
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so
+%{_includedir}/*.h
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/lib*.a
-%{_includedir}/*
 
 
 %changelog
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 2.4-6
+- multiarch conflicts (#342391)
+- -static subpkg
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4-5
+- Autorebuild for GCC 4.3
+
+* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.4-4
+- respin (ppc32)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.4-3
+- License: GPLv2+
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.4-2
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigsegv/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jul 2006 11:34:31 -0000	1.5
+++ sources	15 Aug 2008 17:59:55 -0000	1.6
@@ -1,2 +1 @@
-81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz
 df0fe5f87a01e0b4b53b2cdfa8a730e1  libsigsegv-2.4.tar.gz