From 8c2fd3d0975cb691177b0f16ee7b4e6e1c1bf13c Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 2 Mar 2016 18:59:36 +0100 Subject: [PATCH] Bump version to 2.1.1 --- expat/CMake.README | 12 ++++++------ expat/CMakeLists.txt | 2 +- expat/README | 2 +- expat/expat.spec | 6 +++++- expat/lib/expat.h | 2 +- expat/win32/expat.iss | 10 +++++----- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/expat/CMake.README b/expat/CMake.README index 4db6399c..0b081ee7 100755 --- a/expat/CMake.README +++ b/expat/CMake.README @@ -3,25 +3,25 @@ The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual Studio) and should work on all other platform cmake supports. -Assuming ~/expat-2.1.0 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.1.1 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.1.0$ mkdir build && cd build -~/expat-2.1.0/build$ +~/expat-2.1.1$ mkdir build && cd build +~/expat-2.1.1/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.1.0/build$ cmake .. +~/expat-2.1.1/build$ cmake .. -- The C compiler identification is GNU -- The CXX compiler identification is GNU .... -- Configuring done -- Generating done --- Build files have been written to: /home/patrick/expat-2.1.0/build +-- Build files have been written to: /home/patrick/expat-2.1.1/build If you want to specify the install location for your files, append -DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call. -~/expat-2.1.0/build$ make && make test && make install +~/expat-2.1.1/build$ make && make test && make install Scanning dependencies of target expat [ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o [ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 322add90..353627e2 100755 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -6,7 +6,7 @@ project(expat) cmake_minimum_required(VERSION 2.6) set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org") set(PACKAGE_NAME "expat") -set(PACKAGE_VERSION "2.1.0") +set(PACKAGE_VERSION "2.1.1") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}") diff --git a/expat/README b/expat/README index 1f88467d..9ec8d0c6 100644 --- a/expat/README +++ b/expat/README @@ -1,5 +1,5 @@ - Expat, Release 2.1.0 + Expat, Release 2.1.1 This is Expat, a C library for parsing XML, written by James Clark. Expat is a stream-oriented XML parser. This means that you register diff --git a/expat/expat.spec b/expat/expat.spec index 845bcc12..664aceda 100644 --- a/expat/expat.spec +++ b/expat/expat.spec @@ -1,4 +1,4 @@ -%define version 2.1.0 +%define version 2.1.1 %define release 1 Summary: Expat is an XML 1.0 parser written in C. @@ -40,6 +40,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf /usr/share/man/man1/xmlwf.1.gz %changelog +* Wed Mar 2 2016 Sebastian Pipping +[Release 2.1.1-1] +- Update for the 2.1.1 release. + * Sat Mar 3 2012 Karl Waclawek [Release 2.1.0-1] - Update for the 2.1.0 release. diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 9a21680b..ec62f140 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1038,7 +1038,7 @@ XML_GetFeatureList(void); */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 1 -#define XML_MICRO_VERSION 0 +#define XML_MICRO_VERSION 1 #ifdef __cplusplus } diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index de5b6efd..793887b6 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -7,17 +7,17 @@ [Setup] AppName=Expat AppId=expat -AppVersion=2.1.0 -AppVerName=Expat 2.1.0 +AppVersion=2.1.1 +AppVerName=Expat 2.1.1 AppCopyright=Copyright © 1998-2012 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers AppPublisher=The Expat Developers AppPublisherURL=http://www.libexpat.org/ AppSupportURL=http://www.libexpat.org/ AppUpdatesURL=http://www.libexpat.org/ -UninstallDisplayName=Expat XML Parser 2.1.0 -VersionInfoVersion=2.1.0 +UninstallDisplayName=Expat XML Parser 2.1.1 +VersionInfoVersion=2.1.1 -DefaultDirName={pf}\Expat 2.1.0 +DefaultDirName={pf}\Expat 2.1.1 UninstallFilesDir={app}\Uninstall Compression=lzma -- 2.40.0