rpms/tla/FC-5 tla-remove-invariant.patch, NONE, 1.1 tla.spec, 1.26, 1.27

Joshua W. Boyer (jwboyer) fedora-extras-commits at redhat.com
Sat Mar 18 02:57:07 UTC 2006


Author: jwboyer

Update of /cvs/extras/rpms/tla/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17132

Modified Files:
	tla.spec 
Added Files:
	tla-remove-invariant.patch 
Log Message:
Remove failing invariant check.  Will need to revert when glibc is fixed

tla-remove-invariant.patch:

--- NEW FILE tla-remove-invariant.patch ---
Index: tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c
===================================================================
--- tla-working.orig/src/hackerlab/tests/arrays-tests/unit-ar.c
+++ tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c
@@ -50,7 +50,6 @@ static void
 check_array (size_t size, unsigned long * ar)
 {
   int x;
-  invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1)));
   invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar)));
   for (x = 0; x < size; ++x)
     invariant (ar[x] == HASH_INDEX (x));


Index: tla.spec
===================================================================
RCS file: /cvs/extras/rpms/tla/FC-5/tla.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tla.spec	3 Mar 2006 13:18:56 -0000	1.26
+++ tla.spec	18 Mar 2006 02:57:06 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           tla
 Version:        1.3.4
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        GNU arch revision control system
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@
 Patch0:         %{name}-1.2pre0-posix.patch
 # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4.
 Patch1:         %{name}-1.3.3-sysneon.patch
+Patch2:         %{name}-remove-invariant.patch
 Source2:        %{name}-generate-manpage.pl
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,7 @@
 rm -rf src/libneon
 rm -rf src/expat
 %patch1 -p1
+%patch2 -p1
 
 %build
 mkdir src/=build
@@ -77,6 +79,9 @@
 %{_mandir}/man1/tla.1*
 
 %changelog
+* Fri Mar 17 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.4-4
+- Add patch to remove failing invariant (bug 182742)
+
 * Fri Mar  3 2006 Josh Boyer <jwboyer at jdub.homelinux.org> - 1.3.4-3
 - Remove ppc alignment patch now that glibc is fixed
 




More information about the fedora-extras-commits mailing list