From: Anas Nashif Date: Sun, 4 Nov 2012 23:54:57 +0000 (-0800) Subject: Rebase for expat 2.2.5 X-Git-Tag: accepted/tizen/5.0/base/20181101.090548~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F170290%2F1;p=platform%2Fupstream%2Fexpat.git Rebase for expat 2.2.5 Change-Id: I5e968c0c8623a590b134264682334cf63cb793d2 Signed-off-by: DongHun Kwak --- diff --git a/lib/expat_external.h b/lib/expat_external.h index 629483a..2011837 100644 --- a/lib/expat_external.h +++ b/lib/expat_external.h @@ -94,24 +94,24 @@ #endif /* not defined XML_STATIC */ #if !defined(XMLIMPORT) && defined(__GNUC__) && (__GNUC__ >= 4) -# define XMLIMPORT __attribute__ ((visibility ("default"))) +#define XMLIMPORT __attribute__ ((visibility ("default"))) #endif /* If we didn't define it above, define it away: */ #ifndef XMLIMPORT -# define XMLIMPORT +#define XMLIMPORT #endif #if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)) -# define XML_ATTR_MALLOC __attribute__((__malloc__)) +#define XML_ATTR_MALLOC __attribute__((__malloc__)) #else -# define XML_ATTR_MALLOC +#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))) +#define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) #else -# define XML_ATTR_ALLOC_SIZE(x) +#define XML_ATTR_ALLOC_SIZE(x) #endif #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf new file mode 100644 index 0000000..7a3ab03 --- /dev/null +++ b/packaging/baselibs.conf @@ -0,0 +1,6 @@ +expat +libexpat + obsoletes "expat-" + provides "expat-" +libexpat-devel + requires "libexpat- = " diff --git a/packaging/expat.changes b/packaging/expat.changes new file mode 100644 index 0000000..fd11904 --- /dev/null +++ b/packaging/expat.changes @@ -0,0 +1,6 @@ +* Sun Mar 17 2013 Anas Nashif submit/trunk/20121214.213327@5799e55 +- Update package groups + +* Fri Dec 14 2012 Anas Nashif upstream/2.1.0@5854ad9 +- initial checkin + diff --git a/packaging/expat.manifest b/packaging/expat.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/expat.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/expat.spec b/packaging/expat.spec new file mode 100644 index 0000000..6cfcd56 --- /dev/null +++ b/packaging/expat.spec @@ -0,0 +1,145 @@ + +%if "%{run_tests}" == "1" + # check is defined off at .rpmmacros file. + %define check %%check +%endif + +Name: expat +Version: 2.2.4 +Release: 0 +Url: http://expat.sourceforge.net/ +Summary: XML Parser Toolkit +License: MIT +Group: System/Libraries +Source0: %{name}-%{version}.tar.gz +Source1: baselibs.conf +Source1001: expat.manifest +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkg-config + +%description +Expat is an XML 1.0 parser written in C. It aims to be fully +conformant. It is currently not a validating XML processor. The current +production version of expat can be downloaded from +ftp://ftp.jclark.com/pub/xml/expat.zip. The directory xmltok contains a +low-level library for tokenizing XML. The interface is documented in +xmltok/xmltok.h. The directory xmlparse contains an XML parser library +that is built on top of the xmltok library. The interface is documented +in xmlparse/xmlparse.h. The directory sample contains a simple example +program using this interface. The file sample/build.bat is a batch +file to build the example using Visual C++. The directory xmlwf +contains the xmlwf application, which uses the xmlparse library. The +arguments to xmlwf are one or more files to check for well-formedness. +An option -d dir can be specified. For each well-formed input file, the +corresponding canonical XML is written to dir/f, where f is the +filename (without any path) of the input file. A -x option causes +references to external general entities to be processed. A -s option +makes documents that are not stand-alone cause an error (a document is +considered stand-alone if it is intrinsically stand-alone because it +has no external subset and no references to parameter entities in the +internal subset or it is declared as stand-alone in the XML +declaration). + +%package -n libexpat +Summary: XML Parser Toolkit +Group: System/Libraries + +%description -n libexpat +Expat is an XML 1.0 parser written in C. It aims to be fully +conformant. It is currently not a validating XML processor. The current +production version of expat can be downloaded from +ftp://ftp.jclark.com/pub/xml/expat.zip. The directory xmltok contains a +low-level library for tokenizing XML. The interface is documented in +xmltok/xmltok.h. The directory xmlparse contains an XML parser library +that is built on top of the xmltok library. The interface is documented +in xmlparse/xmlparse.h. The directory sample contains a simple example +program using this interface. The file sample/build.bat is a batch +file to build the example using Visual C++. The directory xmlwf +contains the xmlwf application, which uses the xmlparse library. The +arguments to xmlwf are one or more files to check for well-formedness. +An option -d dir can be specified. For each well-formed input file, the +corresponding canonical XML is written to dir/f, where f is the +filename (without any path) of the input file. A -x option causes +references to external general entities to be processed. A -s option +makes documents that are not stand-alone cause an error (a document is +considered stand-alone if it is intrinsically stand-alone because it +has no external subset and no references to parameter entities in the +internal subset or it is declared as stand-alone in the XML +declaration). + +%package -n libexpat-devel +Summary: XML Parser Toolkit +Group: Development/Libraries +Requires: glibc-devel +Requires: libexpat = %{version} +Provides: expat-devel + +%description -n libexpat-devel +Expat is an XML 1.0 parser written in C. It aims to be fully +conformant. It is currently not a validating XML processor. The current +production version of expat can be downloaded from +ftp://ftp.jclark.com/pub/xml/expat.zip. The directory xmltok contains a +low-level library for tokenizing XML. The interface is documented in +xmltok/xmltok.h. The directory xmlparse contains an XML parser library +that is built on top of the xmltok library. The interface is documented +in xmlparse/xmlparse.h. The directory sample contains a simple example +program using this interface. The file sample/build.bat is a batch +file to build the example using Visual C++. The directory xmlwf +contains the xmlwf application, which uses the xmlparse library. The +arguments to xmlwf are one or more files to check for well-formedness. +An option -d dir can be specified. For each well-formed input file, the +corresponding canonical XML is written to dir/f, where f is the +filename (without any path) of the input file. A -x option causes +references to external general entities to be processed. A -s option +makes documents that are not stand-alone cause an error (a document is +considered stand-alone if it is intrinsically stand-alone because it +has no external subset and no references to parameter entities in the +internal subset or it is declared as stand-alone in the XML +declaration). + +%prep +%setup -q +cp %{SOURCE1001} . +rm -f examples/*.dsp + +%build +export CFLAGS="${CFLAGS} -fPIC" +export CXXFLAGS="${CXXFLAGS} -fPIC" +export LDFLAGS="${LDFLAGS} -pie" + +#%reconfigure --disable-static --with-pic +%reconfigure --disable-static +make %{?_smp_mflags} + +%check + %__make check || exit 0 + +%install +%make_install +rm doc/xmlwf.1 +%remove_docs + +%post -n libexpat -p /sbin/ldconfig + +%postun -n libexpat -p /sbin/ldconfig + +%files +%manifest %{name}.manifest +%defattr(-, root, root) +%license COPYING +%{_bindir}/xmlwf + +%files -n libexpat +%manifest %{name}.manifest +%defattr(-, root, root) +%{_libdir}/libexpat.so.* + +%files -n libexpat-devel +%manifest %{name}.manifest +%defattr(-, root, root) +%{_includedir}/* +%{_libdir}/libexpat.so +%{_libdir}/pkgconfig/expat.pc + +%changelog