SPECS (AC-branch): glib2.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Fri May 12 18:19:13 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   glib2.spec (1.121 -> 1.121.2.1) 

---- Diffs:

================================================================
Index: SPECS/glib2.spec
diff -u SPECS/glib2.spec:1.121 SPECS/glib2.spec:1.121.2.1
--- SPECS/glib2.spec:1.121	Thu Jan 19 17:22:45 2006
+++ SPECS/glib2.spec	Fri May 12 20:19:08 2006
@@ -17,13 +17,13 @@
 Summary(tr):	Yararlý ufak yordamlar kitaplýđý
 Summary(zh_CN):	ĘľÓĂš¤žßşŻĘýżâ
 Name:		glib2
-Version:	2.8.6
+Version:	2.10.2
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Libraries
-Source0:	ftp://ftp.gtk.org/pub/gtk/v2.8/glib-%{version}.tar.bz2
-# Source0-md5:	fce6835fd8c99ab4c3e5213bc5bcd0ed
+Source0:	ftp://ftp.gtk.org/pub/gtk/v2.10/glib-%{version}.tar.bz2
+# Source0-md5:	718961161ee1692c216a2d542196a04a
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-SEGV.patch
 URL:		http://www.gtk.org/
@@ -97,7 +97,6 @@
 Summary(pt_BR):	Conjunto de ferramentas e biblioteca do kit de desenho do GIMP
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk-doc-common
 
 %description devel
 Header files for the support library for the GIMP's X libraries, which
@@ -140,6 +139,18 @@
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento com glib.
 
+%package apidocs
+Summary:	Glib API documetation
+Summary(pl):	Dokumentacja API Glib
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Glib API documetation.
+
+%description apidocs -l pl
+Dokumentacja API Glib.
+
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
@@ -198,7 +209,6 @@
 %{_pkgconfigdir}/*
 %{_libdir}/glib-2.0
 %{_includedir}/*
-%{?with_apidocs:%{_gtkdocdir}/*}
 %{_aclocaldir}/*
 %{_mandir}/man?/*
 
@@ -208,14 +218,47 @@
 %{_libdir}/lib*.a
 %endif
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/*
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121.2.1  2006/05/12 18:19:08  baggins
+- merged from HEAD
+
+Revision 1.123  2006/04/07 20:19:47  freetz
+- 2.10.2
+
+Revision 1.122  2006/03/26 22:43:45  qboosh
+- merged from DEVEL
+
 Revision 1.121  2006/01/19 16:22:45  freetz
 - 2.8.6
+
+Revision 1.120.2.6  2006/03/07 21:24:06  freetz
+- 2.10.1
+
+Revision 1.120.2.5  2006/02/25 08:54:08  freetz
+- 2.10.0
+
+Revision 1.120.2.4  2006/02/11 16:02:11  freetz
+- 2.9.6
+
+Revision 1.120.2.3  2006/01/27 15:54:59  freetz
+- 2.9.5
+
+Revision 1.120.2.2  2006/01/19 08:52:05  freetz
+- 2.9.4
+
+Revision 1.120.2.1  2006/01/18 07:59:11  freetz
+- 2.9.3, apidocs subpkg
 
 Revision 1.120  2006/01/04 15:01:10  freetz
 - 2.8.5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glib2.spec?r1=1.121&r2=1.121.2.1&f=u