X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=gtk-doc.spec;h=6ca074506b0b87dd27ef096adb35dd453fd07bb0;hb=ce8e0528348a3ea307052556e4be1aa8a63134c5;hp=b45a7018b52bc98186fc427b2d68f988752d86fc;hpb=72edc28a4faa94ac5e7ce63fc722b7e34a4a53c2;p=packages%2Fgtk-doc.git

diff --git a/gtk-doc.spec b/gtk-doc.spec
index b45a701..6ca0745 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,4 +1,8 @@
 #
+# Conditional build:
+%bcond_with	tests	# build regression tests programs
+%bcond_without	gnome	# build without gtk-doc-manual in GNOME help format
+#
 %include	/usr/lib/rpm/macros.perl
 #
 Summary:	API documentation generation tool for GTK+ and GNOME
@@ -6,41 +10,43 @@ Summary(es.UTF-8):	El generador de documentación del GTK
 Summary(pl.UTF-8):	Narzędzie do generowania dokumentacji API do GTK+ i GNOME
 Summary(pt_BR.UTF-8):	O gerador de documentação do GTK
 Name:		gtk-doc
-Version:	1.9
-Release:	2
+Version:	1.21
+Release:	1
 License:	GPL v2+
 Group:		Development/Tools
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gtk-doc/1.9/%{name}-%{version}.tar.bz2
-# Source0-md5:	bcd002f381385812737a05538eb8b21e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	e361de4750b707590d9ea1b5550fa738
+Patch0:		%{name}-noarch.patch
 URL:		http://www.gtk.org/rdp/
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
-BuildRequires:	docbook-dtd412-xml >= 1.0-10
-BuildRequires:	docbook-style-xsl
-BuildRequires:	docbook-utils
-BuildRequires:	gnome-common >= 2.12.0-3
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	docbook-dtd43-xml
+BuildRequires:	docbook-style-xsl >= 1.74.0
+%{?with_tests:BuildRequires:	glib2-devel >= 1:2.6.0}
+%{?with_tests:BuildRequires:	libtool}
 BuildRequires:	libxslt-progs >= 1.1.15
-BuildRequires:	openjade
-BuildRequires:	perl-base >= 5.6.0
+BuildRequires:	perl-base >= 1:5.6.0
 BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	python >= 1:2.3
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	scrollkeeper >= 1:0.3.5
-Requires(post,postun):	scrollkeeper
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.446
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+%{?with_gnome:BuildRequires:	yelp-tools}
 Requires:	%{name}-automake = %{version}-%{release}
-Requires:	docbook-dtd412-xml >= 1.0-10
+Requires:	docbook-dtd43-xml
 Requires:	docbook-style-dsssl >= 1.77
-Requires:	docbook-style-xsl >= 1.55.0-3
+Requires:	docbook-style-xsl >= 1.74.0
 Requires:	docbook-utils >= 0.6.10
-Requires:	gnome-doc-tools >= 1.0-4
 Requires:	libxslt-progs >= 1.1.15
 Requires:	openjade
+Requires:	source-highlight
 Conflicts:	pkgconfig < 1:0.19
-#BuildArch:	noarch (rejected by autoconf)
+%{!?with_tests: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.
@@ -49,6 +55,19 @@ used for generating the documentation for GTK+, GLib and GNOME.
 gtk-doc jest narzędziem do generowania dokumentacji API. Jest używany
 do generowania dokumentacji GLib, GTK+ i GNOME.
 
+%package automake
+Summary:	Automake macros for gtk-doc
+Summary(pl.UTF-8):	Makra automake'a do gtk-doc
+Group:		Development/Tools
+Requires:	automake
+Conflicts:	gtk-doc < 0:1.4-3
+
+%description automake
+Automake macros for gtk-doc.
+
+%description automake -l pl.UTF-8
+Makra automake'a do gtk-doc.
+
 %package common
 Summary:	Common directories for documetation generated using gtk-doc
 Summary(pl.UTF-8):	Katalogi na dokumentację wygenerowaną za pomocą gtk-doc
@@ -62,34 +81,25 @@ generated using gtk-doc.
 Katalogi na dokumentację API do różnych pakietów, wygenerowaną za
 pomocą gtk-doc.
 
-%package automake
-Summary:	Automake macros for gtk-doc
-Summary(pl.UTF-8):	Makra dla automake do gtk-doc
-Group:		Development/Tools
-Requires:	automake
-Conflicts:	gtk-doc < 0:1.4-3
-
-%description automake
-Automake macros for gtk-doc.
-
-%description automake -l pl.UTF-8
-Makra dla automake do gtk-doc.
-
 %prep
 %setup -q
+%{!?with_tests:%patch0 -p1}
 mv -f doc/README doc/README.docs
 
 %build
-%{__gnome_doc_common}
-%{__aclocal}
+%{?with_tests:%{__libtoolize}}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	HIGHLIGHT="%{_bindir}/source-highlight" \
+	--disable-silent-rules
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_docdir},%{_datadir}}/gtk-doc/html \
+install -d $RPM_BUILD_ROOT%{_gtkdocdir} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
@@ -97,33 +107,28 @@ install -d $RPM_BUILD_ROOT{%{_docdir},%{_datadir}}/gtk-doc/html \
 
 install examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%find_lang %{name} --with-gnome --all-name
+%if %{with gnome}
+%find_lang gtk-doc-manual --with-gnome
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%scrollkeeper_update_post
-
-%postun
-%scrollkeeper_update_postun
-
-%files -f %{name}.lang
+%files %{?with_gnome:-f gtk-doc-manual.lang}
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS TODO README doc/*
 %attr(755,root,root) %{_bindir}/gtkdoc-*
 %attr(755,root,root) %{_bindir}/gtkdocize
 %{_datadir}/gtk-doc
-%{_pkgconfigdir}/%{name}.pc
+%{_npkgconfigdir}/gtk-doc.pc
 %{_datadir}/sgml/%{name}
 %{_examplesdir}/%{name}-%{version}
-%{_omf_dest_dir}/%{name}
-
-%files common
-%defattr(644,root,root,755)
-%dir %{_docdir}/gtk-doc
-%dir %{_docdir}/gtk-doc/html
 
 %files automake
 %defattr(644,root,root,755)
 %{_aclocaldir}/gtk-doc.m4
+
+%files common
+%defattr(644,root,root,755)
+%dir %{_docdir}/gtk-doc
+%dir %{_gtkdocdir}