Author: megabajt Date: Mon Sep 27 18:01:22 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/glib2: glib2.spec (1.215 -> 1.216) , glib2-makefile.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/glib2/glib2.spec diff -u packages/glib2/glib2.spec:1.215 packages/glib2/glib2.spec:1.216 --- packages/glib2/glib2.spec:1.215 Mon Aug 9 12:42:04 2010 +++ packages/glib2/glib2.spec Mon Sep 27 20:01:15 2010 @@ -18,13 +18,13 @@ Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı Summary(zh_CN.UTF-8): 实用工具函数库 Name: glib2 -Version: 2.24.2 +Version: 2.26.0 Release: 1 Epoch: 1 License: LGPL v2+ Group: Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-%{version}.tar.bz2 -# Source0-md5: 8a6e45d7840460ed84288ebfd75782d4 +Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-%{version}.tar.bz2 +# Source0-md5: 9b7dc61f5e389e1cff277a6350c37397 Patch0: %{name}-makefile.patch URL: http://www.gtk.org/ BuildRequires: autoconf >= 2.54 @@ -161,15 +161,27 @@ %description apidocs -l pl.UTF-8 Dokumentacja API GLib. +%package -n bash-completion-gdbus +Summary: bash-completion for gdbus +Summary(pl.UTF-8): bashowe uzupełnianie nazw dla gdbus +Group: Applications/Shells +Requires: bash-completion + +%description -n bash-completion-gdbus +bash-completion for gdbus. + +%description -n bash-completion-gdbus -l pl.UTF-8 +bashowe uzupełnianie nazw dla gdbus. + %prep %setup -q -n glib-%{version} %patch0 -p1 -sed -i s#...@shaw## po/LINGUAS +%{__sed} -i 's#...@shaw##' po/LINGUAS rm po/[email protected] %if !%{with apidocs} -sed -e '/SUBDIRS/s/docs//' -i Makefile.am -sed -e '/^docs.*Makefile$/d' -i configure.in +%{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am +%{__sed} -e '/^docs.*Makefile$/d' -i configure.ac echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4 %endif @@ -221,7 +233,10 @@ %files -f glib20.lang %defattr(644,root,root,755) %doc AUTHORS README NEWS +%attr(755,root,root) %{_bindir}/gdbus %attr(755,root,root) %{_bindir}/gio-querymodules +%attr(755,root,root) %{_bindir}/glib-compile-schemas +%attr(755,root,root) %{_bindir}/gsettings %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.*.*.* @@ -236,6 +251,10 @@ %dir %{_libdir}/gio/modules %attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so %ghost %{_libdir}/gio/modules/giomodule.cache +%{_mandir}/man1/gdbus.1* +%{_mandir}/man1/gio-querymodules.1* +%{_mandir}/man1/glib-compile-schemas.1* +%{_mandir}/man1/gsettings.1* %files devel %defattr(644,root,root,755) @@ -257,9 +276,11 @@ %{_libdir}/libgobject-2.0.la %{_libdir}/libgthread-2.0.la %dir %{_datadir}/glib-2.0 +%{_datadir}/glib-2.0/gdb %dir %{_datadir}/glib-2.0/gettext %attr(755,root,root) %{_datadir}/glib-2.0/gettext/mkinstalldirs %{_datadir}/glib-2.0/gettext/po +%{_datadir}/glib-2.0/schemas %{_pkgconfigdir}/gio-2.0.pc %{_pkgconfigdir}/gio-unix-2.0.pc %{_pkgconfigdir}/glib-2.0.pc @@ -269,6 +290,7 @@ %{_pkgconfigdir}/gobject-2.0.pc %{_pkgconfigdir}/gthread-2.0.pc %{_libdir}/glib-2.0 +%{_aclocaldir}/gsettings.m4 %{_includedir}/gio-unix-2.0 %{_includedir}/glib-2.0 %{_aclocaldir}/glib-2.0.m4 @@ -300,17 +322,78 @@ %{_gtkdocdir}/gobject %endif +%files -n bash-completion-gdbus +%defattr(644,root,root,755) +%{_sysconfdir}/bash_completion.d/gdbus-bash-completion.sh + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.216 2010/09/27 18:01:15 megabajt +- merged from DEVEL + +Revision 1.213.2.11.2.6 2010/09/27 17:51:59 megabajt +- updated to 2.26.0 + +Revision 1.213.2.11.2.5 2010/09/22 18:17:51 patrys +- 2.25.17 + +Revision 1.213.2.11.2.4 2010/08/31 15:09:54 patrys +- 2.25.15 + +Revision 1.213.2.11.2.3 2010/08/11 08:56:11 lisu +- 2.25.13 + Revision 1.215 2010/08/09 10:42:04 megabajt - updated to 2.24.2 +Revision 1.213.2.11.2.2 2010/08/03 11:53:00 lisu +- 2.25.12 + +Revision 1.213.2.11.2.1 2010/07/12 11:32:43 lisu +- 2.25.11 + +Revision 1.213.2.11 2010/06/25 13:24:39 megabajt +- updated to 2.25.10 + +Revision 1.213.2.10 2010/06/18 13:13:21 lisu +- up to 2.25.9 + +Revision 1.213.2.9 2010/06/12 17:48:09 megabajt +- added bash-completion-gdbus package + +Revision 1.213.2.8 2010/06/12 13:27:35 lisu +- up to 2.25.8 +- add gdbus binary and man pages + +Revision 1.213.2.7 2010/05/27 07:27:23 lisu +- 2.25.7 + +Revision 1.213.2.6 2010/05/23 20:03:46 lisu +- 2.25.6 + Revision 1.214 2010/05/03 11:18:41 lisu - 2.24.1 + +Revision 1.213.2.5 2010/04/26 09:14:34 lisu +- 2.25.3 +- gschema-compile -> glib-compile-schemas +- do not package glib-compile-schemas man pages twice + +Revision 1.213.2.4 2010/04/23 19:12:05 megabajt +- updated to 2.25.2 + +Revision 1.213.2.3 2010/04/22 16:49:02 megabajt +- package more files + +Revision 1.213.2.2 2010/04/22 08:30:51 lisu +- use sed macro + +Revision 1.213.2.1 2010/04/22 08:29:40 lisu +- 2.25.1 Revision 1.213 2010/03/26 20:35:10 megabajt - merged from DEVEL ================================================================ Index: packages/glib2/glib2-makefile.patch diff -u packages/glib2/glib2-makefile.patch:1.1 packages/glib2/glib2-makefile.patch:1.2 --- packages/glib2/glib2-makefile.patch:1.1 Sat Jul 2 22:10:05 2005 +++ packages/glib2/glib2-makefile.patch Mon Sep 27 20:01:15 2010 @@ -9,7 +9,7 @@ - echo "*** Old headers found in $(glibincludedir). You should remove the" ; \ - echo "*** contents of this directory and type 'make install' again." ; \ - false ; \ -- fi +- fi uninstall-local: uninstall-ms-lib uninstall-def-file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glib2/glib2.spec?r1=1.215&r2=1.216&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glib2/glib2-makefile.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
