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

[baggins]

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

---- Files affected:
SPECS:
   gtk-doc.spec (1.40 -> 1.40.2.1) 

---- Diffs:

================================================================
Index: SPECS/gtk-doc.spec
diff -u SPECS/gtk-doc.spec:1.40 SPECS/gtk-doc.spec:1.40.2.1
--- SPECS/gtk-doc.spec:1.40	Sun Jan 15 14:17:45 2006
+++ SPECS/gtk-doc.spec	Fri May 12 20:27:03 2006
@@ -1,15 +1,18 @@
 # $Revision$, $Date$
+#
+%include	/usr/lib/rpm/macros.perl
+#
 Summary:	API documentation generation tool for GTK+ and GNOME
 Summary(es):	El generador de documentación del GTK
 Summary(pl):	Narzędzie do generowania dokumentacji API do GTK+ i GNOME
 Summary(pt_BR):	O gerador de documentaçăo do GTK
 Name:		gtk-doc
-Version:	1.4
-Release:	4
+Version:	1.6
+Release:	1
 License:	GPL v2+
 Group:		Development/Tools
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gtk-doc/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	44d1cdce88c2eb4ccb962998ad0c0d1a
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gtk-doc/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	09c7a89efff2e0bbaba02a12bff58dfd
 URL:		http://www.gtk.org/rdp/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -19,6 +22,11 @@
 BuildRequires:	libxslt-progs >= 1.1.15
 BuildRequires:	openjade
 BuildRequires:	perl-base >= 5.6.0
+BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	scrollkeeper
+Requires(post,postun):	scrollkeeper
+Requires:	%{name}-automake = %{version}-%{release}
 Requires:	docbook-dtd412-xml >= 1.0-10
 Requires:	docbook-style-dsssl >= 1.77
 Requires:	docbook-style-xsl >= 1.55.0-3
@@ -26,9 +34,13 @@
 Requires:	gnome-doc-tools >= 1.0-4
 Requires:	libxslt-progs >= 1.1.15
 Requires:	openjade
-Requires:	%{name}-automake = %{version}-%{release}
+Conflicts:	pkgconfig < 1:0.19
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# architecture-independant pkgconfig dir
+%define		_pkgconfigdir	%{_datadir}/pkgconfig
+
 %description
 gtk-doc is a tool for generating API reference documentation. It is
 used for generating the documentation for GTK+, GLib and GNOME.
@@ -51,7 +63,7 @@
 pomocą gtk-doc.
 
 %package automake
-Summary:	Automake macros for gtk-doc	
+Summary:	Automake macros for gtk-doc
 Summary(pl):	Makra dla automake do gtk-doc
 Group:		Development/Tools
 Requires:	automake
@@ -84,10 +96,18 @@
 
 install examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%find_lang %{name} --with-gnome --all-name
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%post
+%scrollkeeper_update_post
+
+%postun
+%scrollkeeper_update_postun
+
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS TODO README doc/*
 %attr(755,root,root) %{_bindir}/*
@@ -95,6 +115,7 @@
 %{_pkgconfigdir}/%{name}.pc
 %{_datadir}/sgml/%{name}
 %{_examplesdir}/%{name}-%{version}
+%{_omf_dest_dir}/%{name}
 
 %files common
 %defattr(644,root,root,755)
@@ -111,6 +132,28 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40.2.1  2006/05/12 18:27:03  baggins
+- merged from HEAD
+
+Revision 1.46  2006/04/22 07:22:24  qboosh
+- pkgconfig epoch
+
+Revision 1.45  2006/04/21 22:11:00  freetz
+- BR: pkgconfig >= 0.19
+
+Revision 1.44  2006/04/10 17:02:26  qboosh
+- noarch pkgconfigdir needs pkgconfig >= 1:0.19
+
+Revision 1.43  2006/04/10 16:38:17  freetz
+- 1.6, BA: noarch, include perl macros, use architecture-independant
+  pkgconfdir
+
+Revision 1.42  2006/03/07 16:20:05  freetz
+- 1.5, updated file list, update scrollkeeper database (post, postun)
+
+Revision 1.41  2006/02/28 23:37:25  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.40  2006/01/15 13:17:45  qboosh
 - License is GPL (v2+), release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gtk-doc.spec?r1=1.40&r2=1.40.2.1&f=u