Bump to expat 2.1.1

[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Bump to expat 2.1.1
[Cause & Measure] Bump to expat 2.1.1
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I13499e79d23839f2d6482aafe108af30555ea236
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/Makefile.in b/Makefile.in
index 1a84916..6863b09 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,12 +114,11 @@ CPPFLAGS = @CPPFLAGS@ -DHAVE_EXPAT_CONFIG_H
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
-CFLAG_VISIBILITY=@CFLAG_VISIBILITY@
 
 ### autoconf this?
 LTFLAGS = --verbose
 
-COMPILE = $(CC) $(CLFAG_VISIBILITY) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
 CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
 LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
 LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@

diff --git a/configure.ac b/configure.ac
index 8b24103..7e968c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,19 +53,15 @@ AC_CONFIG_HEADER(expat_config.h)
 
 sinclude(conftools/ac_c_bigendian_cross.m4)
 
-sinclude(conftools/visibility.m4)
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
 
 AC_SUBST(LIBCURRENT)
 AC_SUBST(LIBREVISION)
 AC_SUBST(LIBAGE)
 
 dnl Checks for programs.
-AC_PROG_CC_STDC
-AC_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
-gl_VISIBILITY
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
+AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 

diff --git a/lib/expat.h b/lib/expat.h
index cc08d0a..ec62f14 100644 (file)
--- a/lib/expat.h
+++ b/lib/expat.h
@@ -973,13 +973,9 @@ XML_FreeContentModel(XML_Parser parser, XML_Content *model);
 
 /* Exposing the memory handling functions used in Expat */
 XMLPARSEAPI(void *)
-XML_ATTR_MALLOC
-XML_ATTR_ALLOC_SIZE(2)
 XML_MemMalloc(XML_Parser parser, size_t size);
 
 XMLPARSEAPI(void *)
-XML_ATTR_MALLOC
-XML_ATTR_ALLOC_SIZE(3)
 XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);
 
 XMLPARSEAPI(void)

diff --git a/lib/expat_external.h b/lib/expat_external.h
index 7118e9c..2c03284 100644 (file)
--- a/lib/expat_external.h
+++ b/lib/expat_external.h
@@ -65,26 +65,12 @@
 #endif
 #endif  /* not defined XML_STATIC */
 
-#if HAVE_VISIBILTY
-#define XMLIMPORT __attribute__ ((visibility ("default")))
-#endif
 
 /* If we didn't define it above, define it away: */
 #ifndef XMLIMPORT
 #define XMLIMPORT
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
-#define XML_ATTR_MALLOC __attribute__((__malloc__))
-#else
-#define XML_ATTR_MALLOC
-#endif
-
-#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-#define XML_ATTR_ALLOC_SIZE(x)  __attribute__((__alloc_size__(x)))
-#else
-#define XML_ATTR_ALLOC_SIZE(x)
-#endif
 
 #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
 

diff --git a/packaging/expat.spec b/packaging/expat.spec
index ea6ec23..2649a92 100644 (file)
--- a/packaging/expat.spec
+++ b/packaging/expat.spec
@@ -1,5 +1,11 @@
+%define run_tests 0
+%if %{run_tests}
+    # check is defined off at .rpmmacros file.
+    %define check %%check
+%endif
+
 Name:           expat
-Version:        2.1.0
+Version:        2.1.1
 Release:        0
 Url:            http://expat.sourceforge.net/
 Summary:        XML Parser Toolkit
@@ -102,7 +108,9 @@ rm -f examples/*.dsp
 make %{?_smp_mflags}
 
 %check
-make check
+%if %{run_tests}
+    %__make check || exit 0 
+%endif
 
 %install
 %make_install