This commit is contained in:
Matthias Clasen 2010-01-25 21:48:08 +00:00
parent 5b6f8801cc
commit c13999fd89
3 changed files with 40 additions and 6 deletions

View File

@ -1 +1 @@
glib-2.23.1.tar.bz2 glib-2.23.2.tar.bz2

View File

@ -2,7 +2,7 @@
Summary: A library of handy utility functions Summary: A library of handy utility functions
Name: glib2 Name: glib2
Version: 2.23.1 Version: 2.23.2
Release: 1%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -66,7 +66,6 @@ awk '/^Overview of Changes/ { seen+=1 }
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
## glib2.sh and glib2.csh ## glib2.sh and glib2.csh
@ -79,14 +78,45 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo} rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
case "$host" in
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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post
/sbin/ldconfig
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
/sbin/ldconfig
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 -p /sbin/ldconfig
%files -f glib20.lang %files -f glib20.lang
%defattr(-, root, root, -) %defattr(-, root, root, -)
@ -100,6 +130,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/gio %dir %{_libdir}/gio
%dir %{_libdir}/gio/modules %dir %{_libdir}/gio/modules
%{_libdir}/gio/modules/libgiofam.so %{_libdir}/gio/modules/libgiofam.so
%{_bindir}/gio-querymodules*
%files devel %files devel
%defattr(-, root, root, -) %defattr(-, root, root, -)
@ -123,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/lib*.a %{_libdir}/lib*.a
%changelog %changelog
* Mon Jan 25 2010 Matthias Clasen <mclasen@redhat.com> - 2.23.2-1
- Update to 2.23.2
* Mon Dec 20 2009 Matthias Clasen <mclasen@redhat.com> - 2.23.1-1 * Mon Dec 20 2009 Matthias Clasen <mclasen@redhat.com> - 2.23.1-1
- Update to 2.23.1 - Update to 2.23.1

View File

@ -1 +1 @@
fb637f6122690254097d0b6d470f6ed3 glib-2.23.1.tar.bz2 5613fadc27b1cb64f234aed4babfa17b glib-2.23.2.tar.bz2