rpms/iksemel/devel iksemel-64bit.patch, NONE, 1.1 iksemel.spec, 1.3, 1.4

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Thu Nov 16 21:10:19 UTC 2006 

Author: jcollie

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

Modified Files:
	iksemel.spec 
Added Files:
	iksemel-64bit.patch 
Log Message:
Fix 64 bit issues.

iksemel-64bit.patch:

--- NEW FILE iksemel-64bit.patch ---
--- iksemel-1.2/test/tst-sax.c~	2006-11-16 21:49:22.000000000 +0100
+++ iksemel-1.2/test/tst-sax.c	2006-11-16 21:49:22.000000000 +0100
@@ -282,71 +282,71 @@
 main (int argc, char *argv[])
 {
 	document ("<lonely/>");
-	element (IKS_TAG, IKS_SINGLE, "lonely", 0);
+	element (IKS_TAG, IKS_SINGLE, "lonely", NULL);
 	test ();
 
 	document ("<?xml version='1.0'?><parent><child/><child/>child</parent>");
-	element (IKS_TAG, IKS_OPEN, "parent", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
-	element (IKS_TAG, IKS_SINGLE, "child", 0);
+	element (IKS_TAG, IKS_OPEN, "parent", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
+	element (IKS_TAG, IKS_SINGLE, "child", NULL);
 	element (IKS_CDATA, "child");
 	element (IKS_TAG, IKS_CLOSE, "parent");
 	test ();
 
 	document ("<mytag abc='123' id=\"XC72\"></mytag>");
-	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", 0);
+	element (IKS_TAG, IKS_OPEN, "mytag", "abc", "123", "id", "XC72", NULL);
 	element (IKS_TAG, IKS_CLOSE, "mytag");
 	test ();
 
 	document ("<body>I&apos;m fixing parser&amp;tester for &quot;&lt;&quot; and &quot;&gt;&quot; chars.</body>");
-	element (IKS_TAG, IKS_OPEN, "body", 0);
+	element (IKS_TAG, IKS_OPEN, "body", NULL);
 	element (IKS_CDATA, "I'm fixing parser&tester for \"<\" and \">\" chars.");
 	element (IKS_TAG, IKS_CLOSE, "body");
 	test ();
 
 	document ("<tag a='1' b='2' c='3' d='4' e='5' f='6' g='7' id='xyz9'><sub></sub></tag>");
-	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", 0);
-	element (IKS_TAG, IKS_OPEN, "sub", 0);
+	element (IKS_TAG, IKS_OPEN, "tag", "a", "1", "b", "2", "c", "3", "d", "4", "e", "5", "f", "6", "g", "7", "id", "xyz9", NULL);
+	element (IKS_TAG, IKS_OPEN, "sub", NULL);
 	element (IKS_TAG, IKS_CLOSE, "sub");
 	element (IKS_TAG, IKS_CLOSE, "tag");
 	test ();
 
 	document ("<item url='http://jabber.org'><!-- little comment -->Jabber Site</item>");
-	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", 0);
+	element (IKS_TAG, IKS_OPEN, "item", "url", "http://jabber.org", NULL);
 	element (IKS_CDATA, "Jabber Site");
 	element (IKS_TAG, IKS_CLOSE, "item");
 	test ();
 
 	document ("<index><!-- <item> - tag has no childs --><item name='lala' page='42'/></index>");
-	element (IKS_TAG, IKS_OPEN, "index", 0);
-	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", 0);
+	element (IKS_TAG, IKS_OPEN, "index", NULL);
+	element (IKS_TAG, IKS_SINGLE, "item", "name", "lala", "page", "42", NULL);
 	element (IKS_TAG, IKS_CLOSE, "index");
 	test ();
 
 	document ("<ka>1234<![CDATA[ <ka> lala ] ]] ]]] ]]>4321</ka>");
-	element (IKS_TAG, IKS_OPEN, "ka", 0);
+	element (IKS_TAG, IKS_OPEN, "ka", NULL);
 	element (IKS_CDATA, "1234 <ka> lala ] ]] ]]] 4321");
 	element (IKS_TAG, IKS_CLOSE, "ka");
 	test ();
 
 	document ("<test><standalone be='happy'/>abcd<br/>&lt;escape&gt;</test>");
-	element (IKS_TAG, IKS_OPEN, "test", 0);
-	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", 0);
+	element (IKS_TAG, IKS_OPEN, "test", NULL);
+	element (IKS_TAG, IKS_SINGLE, "standalone", "be", "happy", NULL);
 	element (IKS_CDATA, "abcd");
-	element (IKS_TAG, IKS_SINGLE, "br", 0);
+	element (IKS_TAG, IKS_SINGLE, "br", NULL);
 	element (IKS_CDATA, "<escape>");
 	element (IKS_TAG, IKS_CLOSE, "test");
 	test ();
 
 	document ("<a><b>john&amp;mary<c><d e='f' g='123456' h='madcat' klm='nop'/></c></b></a>");
-	element (IKS_TAG, IKS_OPEN, "a", 0);
-	element (IKS_TAG, IKS_OPEN, "b", 0);
+	element (IKS_TAG, IKS_OPEN, "a", NULL);
+	element (IKS_TAG, IKS_OPEN, "b", NULL);
 	element (IKS_CDATA, "john&mary");
-	element (IKS_TAG, IKS_OPEN, "c", 0);
-	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", 0);
-	element (IKS_TAG, IKS_CLOSE, "c", 0);
-	element (IKS_TAG, IKS_CLOSE, "b", 0);
-	element (IKS_TAG, IKS_CLOSE, "a", 0);
+	element (IKS_TAG, IKS_OPEN, "c", NULL);
+	element (IKS_TAG, IKS_SINGLE, "d", "e", "f", "g", "123456", "h", "madcat", "klm", "nop", NULL);
+	element (IKS_TAG, IKS_CLOSE, "c", NULL);
+	element (IKS_TAG, IKS_CLOSE, "b", NULL);
+	element (IKS_TAG, IKS_CLOSE, "a", NULL);
 	test ();
 
 	document ("<test>\xFF</test>");


Index: iksemel.spec
===================================================================
RCS file: /cvs/extras/rpms/iksemel/devel/iksemel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iksemel.spec	29 Aug 2006 00:49:56 -0000	1.3
+++ iksemel.spec	16 Nov 2006 21:09:49 -0000	1.4
@@ -1,13 +1,14 @@
 Name:           iksemel
 Version:        1.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        An XML parser library designed for Jabber applications
 
-Group: 		System Environment/Libraries
+Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://iksemel.jabberstudio.org/
 Source0:        http://files.jabberstudio.org/iksemel/iksemel-%{version}.tar.gz
 Patch0:         iksemel-gcrypt-sha.patch
+Patch1:         iksemel-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnutls-devel
@@ -25,12 +26,12 @@
 ANSI C for POSIX compatible environments, thus highly portable.
 
 %package devel
-Group:		Development/Libraries
-Summary:	Development files for iksemel
+Group:          Development/Libraries
+Summary:        Development files for iksemel
 
-Requires:	%{name} = %{version}-%{release}
-Requires:	gnutls-devel
-Requires:	pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnutls-devel
+Requires:       pkgconfig
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -39,9 +40,9 @@
 Development files for iksemel.
 
 %package utils
-Group:		Applications/Internet
-Summary:	Development files for iksemel
-Requires:	%{name} = %{version}-%{release}
+Group:          Applications/Internet
+Summary:        Development files for iksemel
+Requires:       %{name} = %{version}-%{release}
 
 %description utils
 Utlity programs for iksemel.
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q
 %patch0 -p0
+%patch1 -p1
 
 # force rebuilding of the info file
 rm doc/iksemel
@@ -73,7 +75,7 @@
 mv %{buildroot}%{_infodir}/iksemel %{buildroot}%{_infodir}/iksemel.info
 
 %check
-#make check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -114,6 +116,11 @@
 %{_bindir}/iksroster
 
 %changelog
+* Thu Nov 16 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2-11
+- Add patch from Hans de Goede that fixes 64 bit issues
+- Re-enable "make check".
+- Remove tabs from specfile.
+
 * Mon Aug 28 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2-10
 - Bump release and rebuild.

More information about the scm-commits mailing list