SPECS: glib2.spec - updated to 2.16.0; merged changes from DEVEL

megabajt megabajt at pld-linux.org
Mon Mar 10 20:05:35 CET 2008


Author: megabajt                     Date: Mon Mar 10 19:05:35 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.16.0; merged changes from DEVEL

---- Files affected:
SPECS:
   glib2.spec (1.171 -> 1.172) 

---- Diffs:

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.171 SPECS/glib2.spec:1.172
--- SPECS/glib2.spec:1.171	Thu Feb  7 22:01:44 2008
+++ SPECS/glib2.spec	Mon Mar 10 20:05:29 2008
@@ -17,29 +17,28 @@
 Summary(tr.UTF-8):	Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):	实用工具函数库
 Name:		glib2
-Version:	2.14.6
+Version:	2.16.0
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-%{version}.tar.bz2
-# Source0-md5:	3b340946d6916ee9cbf2c348e7c099f1
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-%{version}.tar.bz2
+# Source0-md5:	9b1e503956265050bc0bfd9feb2cc2d2
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-SEGV.patch
-Patch2:		%{name}-noarch.patch
-Patch3:		%{name}-asneeded.patch
 URL:		http://www.gtk.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
+BuildRequires:	fam-devel
 BuildRequires:	gettext-devel
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
 %{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.8}
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	pcre-devel >= 7.6
 BuildRequires:	perl-base
-BuildRequires:	pkgconfig >= 1:0.14.0
+BuildRequires:	pkgconfig >= 1:0.16.0
 BuildRequires:	rpmbuild(macros) >= 1.197
 %{!?with_apidocs:BuildRequires:	sed >= 4.0}
 Requires:	iconv
@@ -165,8 +164,6 @@
 %setup -q -n glib-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %if !%{with apidocs}
 sed -e '/SUBDIRS/s/docs//' -i Makefile.am
@@ -200,9 +197,11 @@
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.{la,a}
+
 [ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
 	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang glib20 --with-gnome
+%find_lang glib20
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -213,6 +212,8 @@
 %files -f glib20.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README NEWS
+%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.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libglib-2.0.so.0
 %attr(755,root,root) %{_libdir}/libgmodule-2.0.so.*.*.*
@@ -221,6 +222,9 @@
 %attr(755,root,root) %ghost %{_libdir}/libgobject-2.0.so.0
 %attr(755,root,root) %{_libdir}/libgthread-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgthread-2.0.so.0
+%dir %{_libdir}/gio
+%dir %{_libdir}/gio/modules
+%attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -229,26 +233,33 @@
 %attr(755,root,root) %{_bindir}/glib-gettextize
 %attr(755,root,root) %{_bindir}/glib-mkenums
 %attr(755,root,root) %{_bindir}/gobject-query
+%attr(755,root,root) %{_bindir}/gtester
+%attr(755,root,root) %{_bindir}/gtester-report
+%attr(755,root,root) %{_libdir}/libgio-2.0.so
 %attr(755,root,root) %{_libdir}/libglib-2.0.so
 %attr(755,root,root) %{_libdir}/libgmodule-2.0.so
 %attr(755,root,root) %{_libdir}/libgobject-2.0.so
 %attr(755,root,root) %{_libdir}/libgthread-2.0.so
+%{_libdir}/libgio-2.0.la
 %{_libdir}/libglib-2.0.la
 %{_libdir}/libgmodule-2.0.la
 %{_libdir}/libgobject-2.0.la
 %{_libdir}/libgthread-2.0.la
-%{_includedir}/glib-2.0
-%{_libdir}/glib-2.0
 %dir %{_datadir}/glib-2.0
 %dir %{_datadir}/glib-2.0/gettext
 %attr(755,root,root) %{_datadir}/glib-2.0/gettext/mkinstalldirs
 %{_datadir}/glib-2.0/gettext/po
+%{_pkgconfigdir}/gio-2.0.pc
+%{_pkgconfigdir}/gio-unix-2.0.pc
 %{_pkgconfigdir}/glib-2.0.pc
 %{_pkgconfigdir}/gmodule-2.0.pc
 %{_pkgconfigdir}/gmodule-export-2.0.pc
 %{_pkgconfigdir}/gmodule-no-export-2.0.pc
 %{_pkgconfigdir}/gobject-2.0.pc
 %{_pkgconfigdir}/gthread-2.0.pc
+%{_libdir}/glib-2.0
+%{_includedir}/gio-unix-2.0
+%{_includedir}/glib-2.0
 %{_aclocaldir}/glib-2.0.m4
 %{_aclocaldir}/glib-gettext.m4
 %if %{with apidocs}
@@ -261,6 +272,7 @@
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/libgio-2.0.a
 %{_libdir}/libglib-2.0.a
 %{_libdir}/libgmodule-2.0.a
 %{_libdir}/libgobject-2.0.a
@@ -270,6 +282,7 @@
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
+%{_gtkdocdir}/gio
 %{_gtkdocdir}/glib
 %{_gtkdocdir}/gobject
 %endif
@@ -280,19 +293,52 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.171  2008-02-07 21:01:44  megabajt
+Revision 1.172  2008-03-10 19:05:29  megabajt
+- updated to 2.16.0; merged changes from DEVEL
+
+Revision 1.157.4.13  2008-02-26 22:57:29  megabajt
+- updated to 2.15.6
+
+Revision 1.157.4.12  2008-02-12 09:16:05  megabajt
+- updated to 2.15.5
+
+Revision 1.171  2008/02/07 21:01:44  megabajt
 - use GNOME ftp
 
 Revision 1.170  2008-02-07 20:56:27  megabajt
 - updated to 2.14.6
 
-Revision 1.169  2008-01-08 20:45:16  qboosh
+Revision 1.157.4.11  2008-01-29 19:10:46  megabajt
+- updated to 2.15.4
+- -noarch and -asneeded patches applied upstream
+
+Revision 1.157.4.10  2008-01-24 11:49:15  patrys
+- use GNOME ftp, gtk is crazy and claims the file is 4K
+
+Revision 1.157.4.9  2008-01-21 19:37:42  megabajt
+- updated to 2.15.3
+
+Revision 1.157.4.8  2008-01-14 17:58:17  megabajt
+- updated to 2.15.2
+
+Revision 1.169  2008/01/08 20:45:16  qboosh
 - more verbose files, ghost soname symlinks
 
 Revision 1.168  2008-01-08 14:30:10  megabajt
 - updated to 2.14.5
 
-Revision 1.167  2007-11-24 18:10:23  megabajt
+Revision 1.157.4.7  2008-01-07 19:41:09  megabajt
+- updated to 2.15.1
+- more verbose files
+
+Revision 1.157.4.6  2007-12-22 23:23:54  megabajt
+- merged changes from HEAD
+
+Revision 1.157.4.5  2007-12-21 03:04:50  patrys
+- 2.15.0
+- here comes gio
+
+Revision 1.167  2007/11/24 18:10:23  megabajt
 - updated to 2.14.4
 
 Revision 1.166  2007-11-07 17:01:32  megabajt
@@ -323,6 +369,18 @@
 Revision 1.158  2007/06/15 08:11:21  glen
 - Provide: glib2-libs to avoid massive rebuilds; rel 2
 
+Revision 1.157.4.4  2007-06-07 15:26:15  megabajt
+- updated to 2.13.4
+
+Revision 1.157.4.3  2007/06/02 13:20:28  aflinta
+- 2.13.2
+
+Revision 1.157.4.2  2007/05/03 09:25:21  megabajt
+- updated to 2.13.1
+
+Revision 1.157.4.1  2007/05/02 12:03:04  megabajt
+- updated to 2.13.0
+
 Revision 1.157  2007/05/02 10:15:16  megabajt
 - updated to 2.12.12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glib2.spec?r1=1.171&r2=1.172&f=u



More information about the pld-cvs-commit mailing list