[mxml] Update to 2.7

[Brendan Jones]

commit ac1f116109a997ee17b88e896c023e6962961a43
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Wed Dec 4 14:36:09 2013 +0100

    Update to 2.7

 .gitignore           |    1 +
 mxml-no-rpath.patch  |   26 ++++++++++++++++++++------
 mxml-pkgconfig.patch |    9 ---------
 mxml.spec            |   16 ++++++++--------
 sources              |    2 +-
 5 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27f225b..883834b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mxml-2.5.tar.gz
+/mxml-2.7.tar.gz
diff --git a/mxml-no-rpath.patch b/mxml-no-rpath.patch
index 47b2923..0c09968 100644
--- a/mxml-no-rpath.patch
+++ b/mxml-no-rpath.patch
@@ -1,14 +1,28 @@
-diff -up ./configure.BAD ./configure
---- ./configure.BAD	2008-08-11 12:03:32.000000000 -0400
-+++ ./configure	2008-08-11 12:04:02.000000000 -0400
-@@ -4654,8 +4654,8 @@ echo "${ECHO_T}yes" >&6; }
+diff -Nurp mxml-2.7/configure mxml-2.7.mod/configure
+--- mxml-2.7/configure	2011-03-24 06:02:54.000000000 +0100
++++ mxml-2.7.mod/configure	2013-12-04 14:31:56.704610051 +0100
+@@ -4715,8 +4715,8 @@ echo "${ECHO_T}yes" >&6; }
  echo "${ECHO_T}yes" >&6; }
- 			LIBMXML="libmxml.so.1.4"
+ 			LIBMXML="libmxml.so.1.5"
  			DSO="\$(CC)"
 -			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
 -                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
 +			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1 -shared \$(OPTIM)"
-+                        LDFLAGS="$LDFLAGS"
++                        LDFLAGS="$LDFLAGS -Wl,-soname,libmxml.so.1"
+ 			;;
+ 
+ 		*BSD*)
+diff -Nurp mxml-2.7/configure.in mxml-2.7.mod/configure.in
+--- mxml-2.7/configure.in	2011-01-03 03:03:29.000000000 +0100
++++ mxml-2.7.mod/configure.in	2013-12-04 14:33:45.288611088 +0100
+@@ -196,8 +196,8 @@ if test x$enable_shared != xno; then
+ 			AC_MSG_RESULT(yes)
+ 			LIBMXML="libmxml.so.1.5"
+ 			DSO="\$(CC)"
+-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
+-                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
++			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1 -shared \$(OPTIM)"
++                        LDFLAGS="$LDFLAGS -Wl,-soname,libmxml.so.1"
  			;;
  
  		*BSD*)
diff --git a/mxml.spec b/mxml.spec
index 1745970..cd0a5e5 100644
--- a/mxml.spec
+++ b/mxml.spec
@@ -1,14 +1,12 @@
 Summary:      Miniature XML development library
 Name:         mxml
-Version:      2.5
-Release:      10%{?dist}
+Version:      2.7
+Release:      1%{?dist}
 License:      LGPLv2+
 Group:        System Environment/Libraries
-URL:          http://www.easysw.com/~mike/mxml/
-Source0:      http://ftp.easysw.com/pub/mxml/%{version}/mxml-%{version}.tar.gz
+URL:          http://www.msweet.org/blog.php?L+Z3
+Source0:      https://www.msweet.org/files/project3/mxml-2.7.tar.gz
 Patch0:       mxml-no-rpath.patch
-# Fix the typo in .pc file. Already fixed in upstream trunk
-Patch1:       mxml-pkgconfig.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This is requires because we patch configure.in.
@@ -31,8 +29,7 @@ applications.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0 -b .pthread
+%patch0 -p1
 
 %build
 # Run autoconf since we patched configure.in.
@@ -77,6 +74,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/mxml.pc
 
 %changelog
+* Tue Dec 03 2013 Brendan Jones <brendan.jones.it at gmail.com> 2.6-1
+- Update to 2.7
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index d2139d7..26bf64a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f706377fba630b39fa02fd63642b17e5  mxml-2.5.tar.gz
+76f2ae49bf0f5745d5cb5d9507774dc9  mxml-2.7.tar.gz