[packages/crossmingw32-expat] - updated to 2.1.0 (note: new soname) - updated ac_fixes patch - removed outdated soname patch
qboosh
qboosh at pld-linux.org
Fri May 29 20:30:36 CEST 2015
commit ee06e98c65840140d6368c19a6784c1db17f6760
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri May 29 20:32:01 2015 +0200
- updated to 2.1.0 (note: new soname)
- updated ac_fixes patch
- removed outdated soname patch
crossmingw32-expat.spec | 20 +++++++++++---------
expat-ac_fixes.patch | 12 +++++-------
expat-soname.patch | 11 -----------
3 files changed, 16 insertions(+), 27 deletions(-)
---
diff --git a/crossmingw32-expat.spec b/crossmingw32-expat.spec
index b83d4e1..9a966ee 100644
--- a/crossmingw32-expat.spec
+++ b/crossmingw32-expat.spec
@@ -2,16 +2,15 @@ Summary: XML 1.0 parser - Ming32 cross version
Summary(pl.UTF-8): Analizator składni XML-a 1.0 - wersja skrośna dla Ming32
%define realname expat
Name: crossmingw32-%{realname}
-Version: 2.0.1
-Release: 4
+Version: 2.1.0
+Release: 1
License: Thai Open Source Software Center Ltd (distributable)
Group: Development/Libraries
-Source0: http://dl.sourceforge.net/expat/%{realname}-%{version}.tar.gz
-# Source0-md5: ee8b492592568805593f81f8cdf2a04c
+Source0: http://downloads.sourceforge.net/expat/%{realname}-%{version}.tar.gz
+# Source0-md5: dd7dab7a5fea97d2a6a43f511449b7cd
Patch0: %{realname}-ac_fixes.patch
-Patch1: %{realname}-soname.patch
-URL: http://expat.sourceforge.net/
-BuildRequires: autoconf
+URL: http://www.libexpat.org/
+BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: crossmingw32-gcc
BuildRequires: libtool
@@ -26,9 +25,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysprefix /usr
%define _prefix %{_sysprefix}/%{target}
%define _libdir %{_prefix}/lib
+%define _pkgconfigdir %{_prefix}/lib/pkgconfig
%define _dlldir /usr/share/wine/windows/system
%define __cc %{target}-gcc
%define __cxx %{target}-g++
+%define __pkgconfig_provides %{nil}
+%define __pkgconfig_requires %{nil}
%ifnarch %{ix86}
# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
@@ -79,7 +81,6 @@ Biblioteka DLL expat dla Windows.
%prep
%setup -q -n %{realname}-%{version}
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -115,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libexpat.dll.a
%{_libdir}/libexpat.la
%{_includedir}/expat*.h
+%{_pkgconfigdir}/expat.pc
%files static
%defattr(644,root,root,755)
@@ -122,4 +124,4 @@ rm -rf $RPM_BUILD_ROOT
%files dll
%defattr(644,root,root,755)
-%{_dlldir}/libexpat-0.dll
+%{_dlldir}/libexpat-1.dll
diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
index ebc5208..0a36e88 100644
--- a/expat-ac_fixes.patch
+++ b/expat-ac_fixes.patch
@@ -1,20 +1,18 @@
-diff -urN expat-2.0.0.org/configure.in expat-2.0.0/configure.in
---- expat-2.0.0.org/configure.in 2006-01-11 02:10:46.000000000 +0100
-+++ expat-2.0.0/configure.in 2006-04-09 18:08:18.483504500 +0200
+--- expat-2.1.0/configure.in~ 2012-07-28 10:41:03.000000000 +0300
++++ expat-2.1.0/configure.in 2012-07-28 10:41:41.511402972 +0300
@@ -26,7 +26,7 @@
define([expat_version], ifdef([__gnu__],
[esyscmd(conftools/get-version.sh lib/expat.h)],
- [2.0.x]))
+ [2.1.x]))
-AC_INIT(expat, expat_version, expat-bugs at libexpat.org)
-+AC_INIT(expat, 2.0.0, expat-bugs at libexpat.org)
++AC_INIT(expat, 2.1.0, expat-bugs at libexpat.org)
undefine([expat_version])
AC_CONFIG_SRCDIR(Makefile.in)
-@@ -50,9 +50,6 @@
+@@ -51,8 +51,6 @@
AC_CONFIG_HEADER(expat_config.h)
--sinclude(conftools/libtool.m4)
-sinclude(conftools/ac_c_bigendian_cross.m4)
-
AC_LIBTOOL_WIN32_DLL
diff --git a/expat-soname.patch b/expat-soname.patch
deleted file mode 100644
index 8fd504c..0000000
--- a/expat-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- expat-2.0.1/configure.in.orig 2006-04-18 23:08:39.531073000 +0200
-+++ expat-2.0.1/configure.in 2006-04-18 23:18:45.256928500 +0200
-@@ -46,7 +46,7 @@
-
- LIBCURRENT=6
- LIBREVISION=2
--LIBAGE=5
-+LIBAGE=6
-
- AC_CONFIG_HEADER(expat_config.h)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-expat.git/commitdiff/ee06e98c65840140d6368c19a6784c1db17f6760
More information about the pld-cvs-commit
mailing list