[mingw-libsoup: 26/30] Update to 2.37.90

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 19:35:52 UTC 2012


commit 2c8e7d1e80ddfa77b11b4a49c8a474600acf9bb3
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Feb 28 15:09:28 2012 +0200

    Update to 2.37.90
    
    ... and remove the .la files.

 .gitignore           |    1 +
 mingw32-libsoup.spec |   16 ++++++++--------
 sources              |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b63b8be..0be8df2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ libsoup-2.28.1.tar.bz2
 /libsoup-2.36.0.tar.xz
 /libsoup-2.36.1.tar.xz
 /libsoup-2.37.5.tar.xz
+/libsoup-2.37.90.tar.xz
diff --git a/mingw32-libsoup.spec b/mingw32-libsoup.spec
index 66693f9..583be0d 100644
--- a/mingw32-libsoup.spec
+++ b/mingw32-libsoup.spec
@@ -6,8 +6,8 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:		mingw32-libsoup
-Version:	2.37.5
-Release:	2%{?dist}
+Version:	2.37.90
+Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -24,8 +24,6 @@ BuildRequires:	mingw32-glib2
 BuildRequires:	mingw32-libxml2
 BuildRequires:	mingw32-sqlite
 
-Requires:	pkgconfig
-
 Patch0:		libsoup-workaround-gnome-bug-595176.patch
 
 
@@ -93,8 +91,8 @@ make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
 make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
 mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
 
-# Manually merge the libtool files
-sed -i s/"old_library=''"/"old_library='libsoup-2.4.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libsoup-2.4.la
+# Remove the .la files
+rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
 
 # Drop the folder which was temporary used for installing the static bits
 rm -rf $RPM_BUILD_ROOT/build_static
@@ -110,9 +108,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 %{_mingw32_includedir}/libsoup-2.4
 %{_mingw32_includedir}/libsoup-gnome-2.4
 %{_mingw32_libdir}/libsoup-2.4.dll.a
-%{_mingw32_libdir}/libsoup-2.4.la
 %{_mingw32_libdir}/libsoup-gnome-2.4.dll.a
-%{_mingw32_libdir}/libsoup-gnome-2.4.la
 %{_mingw32_libdir}/pkgconfig/libsoup-2.4.pc
 %{_mingw32_libdir}/pkgconfig/libsoup-gnome-2.4.pc
 
@@ -122,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 
 
 %changelog
+* Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 2.37.90-1
+- Update to 2.37.90
+- Remove the .la files
+
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.37.5-2
 - Rebuild against the mingw-w64 toolchain
 
diff --git a/sources b/sources
index 7bc12dd..841ae6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80448c0aef30218b86b86f8f87b39b6f  libsoup-2.37.5.tar.xz
+ad4697703775ab1cfd3016d189134bd5  libsoup-2.37.90.tar.xz


More information about the scm-commits mailing list