Author: megabajt Date: Fri Mar 26 20:35:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/glib2: glib2.spec (1.212 -> 1.213) ---- Diffs: ================================================================ Index: packages/glib2/glib2.spec diff -u packages/glib2/glib2.spec:1.212 packages/glib2/glib2.spec:1.213 --- packages/glib2/glib2.spec:1.212 Wed Mar 17 09:20:56 2010 +++ packages/glib2/glib2.spec Fri Mar 26 21:35:10 2010 @@ -18,13 +18,13 @@ Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı Summary(zh_CN.UTF-8): 实用工具函数库 Name: glib2 -Version: 2.22.5 +Version: 2.24.0 Release: 1 Epoch: 1 License: LGPL v2+ Group: Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-%{version}.tar.bz2 -# Source0-md5: 63413f704c2b07d6e81469b25cff5e60 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-%{version}.tar.bz2 +# Source0-md5: 45a8bc697d07f859566c0b64c40382a8 Patch0: %{name}-makefile.patch URL: http://www.gtk.org/ BuildRequires: autoconf >= 2.54 @@ -42,7 +42,8 @@ BuildRequires: pkgconfig >= 1:0.16.0 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.197 -%{!?with_apidocs:BuildRequires: sed >= 4.0} +BuildRequires: sed >= 4.0 +BuildRequires: zlib-devel Requires: iconv Requires: pcre >= 7.8 Provides: glib2-libs @@ -163,6 +164,8 @@ %prep %setup -q -n glib-%{version} %patch0 -p1 +sed -i s#...@shaw## po/LINGUAS +rm po/[email protected] %if !%{with apidocs} sed -e '/SUBDIRS/s/docs//' -i Makefile.am @@ -197,6 +200,8 @@ m4datadir=%{_aclocaldir} \ pkgconfigdir=%{_pkgconfigdir} +> $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache + rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.{la,a} %find_lang glib20 @@ -204,12 +209,19 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post +/sbin/ldconfig + +umask 022 +%{_bindir}/gio-querymodules %{_libdir}/gio/modules +exit 0 + %postun -p /sbin/ldconfig %files -f glib20.lang %defattr(644,root,root,755) %doc AUTHORS README NEWS +%attr(755,root,root) %{_bindir}/gio-querymodules %attr(755,root,root) %{_libdir}/libgio-2.0.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libgio-2.0.so.0 %attr(755,root,root) %{_libdir}/libglib-2.0.so.*.*.* @@ -223,6 +235,7 @@ %dir %{_libdir}/gio %dir %{_libdir}/gio/modules %attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so +%ghost %{_libdir}/gio/modules/giomodule.cache %files devel %defattr(644,root,root,755) @@ -293,10 +306,31 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.213 2010/03/26 20:35:10 megabajt +- merged from DEVEL + +Revision 1.207.2.9 2010/03/26 20:26:39 megabajt +- updated to 2.24.0 + +Revision 1.207.2.8 2010/03/22 18:59:29 megabajt +- updated to 2.23.6 + Revision 1.212 2010/03/17 08:20:56 lisu - up to 2.22.5 - adapter +Revision 1.207.2.7 2010/03/12 20:18:09 megabajt +- updated to 2.23.5 + +Revision 1.207.2.6 2010/02/22 14:32:46 lisu +- 2.23.4 + +Revision 1.207.2.5 2010/02/10 11:55:43 megabajt +- updated to 2.23.3 + +Revision 1.207.2.4 2010/02/05 14:20:05 lisu +- 2.23.2 + Revision 1.211 2010/01/15 00:33:51 sparky - dropped BR: source-highlight -- not used directly @@ -306,8 +340,18 @@ Revision 1.209 2010/01/14 19:41:48 arekm - up to 2.22.4 +Revision 1.207.2.3 2009/12/28 14:30:09 patrys +- drop e...@shaw + +Revision 1.207.2.2 2009/12/28 14:14:22 patrys +- 2.23.1 + Revision 1.208 2009/12/02 22:58:44 megabajt - updated to 2.22.3 + +Revision 1.207.2.1 2009/12/01 08:39:14 lisu +- 2.23.0 +- adapter Revision 1.207 2009/10/08 14:02:22 arekm - up to 2.22.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glib2/glib2.spec?r1=1.212&r2=1.213&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
