rpms/mingw-glib2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.31.20 and some cleanups

Browse Source 
- Update to 2.31.20
- Dropped unneeded BR: mingw32-dlfcn
- Dropped .la files
This commit is contained in:
Erik van Pienbroek 2012-03-08 19:45:57 +01:00
parent 89dc34918d
commit e07da3d967
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mingw-glib2.spec
View File

@ -3,8 +3,8 @@
%define __debug_install_post %{mingw32_debug_install_post}
Name: mingw-glib2
Version: 2.31.18
Release: 2%{?dist}
Version: 2.31.20
Release: 1%{?dist}
Summary: MinGW Windows GLib2 library
License: LGPLv2+
@ -19,7 +19,6 @@ BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-dlfcn
BuildRequires: mingw32-win-iconv
BuildRequires: mingw32-gettext
BuildRequires: mingw32-libffi
@ -84,14 +83,7 @@ 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='libgio-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgio-2.0.la
sed -i s/"old_library=''"/"old_library='libglib-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libglib-2.0.la
sed -i s/"old_library=''"/"old_library='libgobject-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgobject-2.0.la
sed -i s/"old_library=''"/"old_library='libgmodule-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgmodule-2.0.la
sed -i s/"old_library=''"/"old_library='libgthread-2.0.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgthread-2.0.la
# There's also a small difference in the file glibconfig.h between the
# There's a small difference in the file glibconfig.h between the
# shared and the static build:
#
#diff -ur shared/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h static/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include/glibconfig.h
@ -134,6 +126,9 @@ rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/gdbus-codegen
rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gdbus-2.0
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
%find_lang glib20
@ -161,15 +156,10 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gdbus-2.0
%dir %{mingw32_libdir}/gio/
%dir %{mingw32_libdir}/gio/modules/
%{mingw32_libdir}/libgio-2.0.dll.a
%{mingw32_libdir}/libgio-2.0.la
%{mingw32_libdir}/libglib-2.0.dll.a
%{mingw32_libdir}/libglib-2.0.la
%{mingw32_libdir}/libgmodule-2.0.dll.a
%{mingw32_libdir}/libgmodule-2.0.la
%{mingw32_libdir}/libgobject-2.0.dll.a
%{mingw32_libdir}/libgobject-2.0.la
%{mingw32_libdir}/libgthread-2.0.dll.a
%{mingw32_libdir}/libgthread-2.0.la
%{mingw32_libdir}/pkgconfig/gio-2.0.pc
%{mingw32_libdir}/pkgconfig/gio-windows-2.0.pc
%{mingw32_libdir}/pkgconfig/glib-2.0.pc
@ -192,6 +182,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gdbus-2.0
%changelog
* Thu Mar 08 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.31.20-1
- Update to 2.31.20
- Dropped unneeded BR: mingw32-dlfcn
- Dropped .la files
* Tue Mar 06 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.31.18-2
- Renamed the source package to mingw-glib2 (RHBZ #800389)
- Use mingw macros without leading underscore

2
sources
View File

@ -1 +1 @@
0e41bbd820d5a0574eefad30709726b0 glib-2.31.18.tar.xz
16e1964e993b065c703157db17218d2a glib-2.31.20.tar.xz