[expat] update to 2.1.0 (#806602)
jorton
jorton at fedoraproject.org
Mon Mar 26 09:57:22 UTC 2012
commit 1aae02c2dca4eaf5d4b1f9dcfa9c3c669af40632
Author: Joe Orton <jorton at redhat.com>
Date: Mon Mar 26 10:57:12 2012 +0100
update to 2.1.0 (#806602)
Resolves: rhbz#806602
.gitignore | 3 +++
expat-1.95.8-CVE-2009-3720.patch | 11 -----------
expat-1.95.8-pedantic.patch | 11 -----------
expat-2.0.1-CVE-2009-3560-revised.patch | 12 ------------
expat-2.0.1-confcxx.patch | 13 -------------
expat.spec | 17 +++++++----------
sources | 2 +-
7 files changed, 11 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87efd06..0c5635c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ i386
*.rpm
clog
expat-2.0.1.tar.gz
+/results_expat
+/expat-2.?.?
+/expat-2.1.0.tar.gz
diff --git a/expat.spec b/expat.spec
index 2109386..075b8a0 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,12 +1,9 @@
Summary: An XML parser library
Name: expat
-Version: 2.0.1
-Release: 12%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/expat/expat-%{version}.tar.gz
-Patch1: expat-2.0.1-confcxx.patch
-Patch2: expat-2.0.1-CVE-2009-3560-revised.patch
-Patch3: expat-1.95.8-CVE-2009-3720.patch
URL: http://www.libexpat.org/
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,13 +28,9 @@ to develop XML applications with expat.
%prep
%setup -q
-%patch1 -p1 -b .confcxx
-%patch2 -p1 -b .newcve3560
-%patch3 -p1 -b .cve3720
%build
rm -rf autom4te*.cache
-rm conftools/libtool.m4
libtoolize --copy --force --automake && aclocal && autoheader && autoconf
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
%configure --libdir=/%{_lib} --disable-static
@@ -54,7 +47,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mv $RPM_BUILD_ROOT/%{_lib}/libexpat.so $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/libexpat.la \
+ $RPM_BUILD_ROOT/%{_lib}/pkgconfig/*.pc
lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
@@ -82,6 +76,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_includedir}/*.h
%changelog
+* Mon Mar 26 2012 Joe Orton <jorton at redhat.com> - 2.1.0-1
+- update to 2.1.0 (#806602)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 9d051ba..7107749 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz
+dd7dab7a5fea97d2a6a43f511449b7cd expat-2.1.0.tar.gz
More information about the scm-commits
mailing list