This commit is contained in:
Matthias Clasen 2010-05-19 22:27:18 +00:00
parent eb0dd09ea8
commit 9c7bde4fee
3 changed files with 11 additions and 33 deletions

View File

@ -1 +1 @@
glib-2.25.5.tar.bz2 glib-2.25.6.tar.bz2

View File

@ -2,8 +2,8 @@
Summary: A library of handy utility functions Summary: A library of handy utility functions
Name: glib2 Name: glib2
Version: 2.25.5 Version: 2.25.6
Release: 2%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
@ -82,45 +82,19 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
# Install multilib wrappers for the binaries # Install multilib wrappers for the binaries
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gio-modules install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gio-modules
case "$host" in mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-%{__isa_bits}
alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-64
;;
*)
mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-32
;;
esac
%find_lang glib20 %find_lang glib20
%clean
rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
case "$host" in
alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
%{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
;;
*)
%{_bindir}/gio-querymodules-32 %{_libdir}/gio/modules
;;
esac
%postun %postun
/sbin/ldconfig /sbin/ldconfig
gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
case "$host" in
alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
%{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
;;
*)
%{_bindir}/gio-querymodules-32 %{_libdir}/gio/modules
;;
esac
%files -f glib20.lang %files -f glib20.lang
@ -184,6 +158,10 @@ esac
%{_libdir}/lib*.a %{_libdir}/lib*.a
%changelog %changelog
* Wed May 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.25.6-1
- Update to 2.25.6
- Simplify gio-querymodules handling
* Mon May 17 2010 Matthias Clasen <mclasen@redhat.com> - 2.25.5-2 * Mon May 17 2010 Matthias Clasen <mclasen@redhat.com> - 2.25.5-2
- Remove an erroneous removal - Remove an erroneous removal

View File

@ -1 +1 @@
86973aa98f227c2bddf7312e668b9b70 glib-2.25.5.tar.bz2 bd47fb74e7b479ce25015694abd42abd glib-2.25.6.tar.bz2