packages: libethos/libethos.spec - autofoo* - separate apidocs + bcond - so...

[deejay1]

Author: deejay1                      Date: Sat Apr 24 08:36:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- autofoo*
- separate apidocs + bcond
- some cleanups
- rel. 2

---- Files affected:
packages/libethos:
   libethos.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/libethos/libethos.spec
diff -u packages/libethos/libethos.spec:1.2 packages/libethos/libethos.spec:1.3
--- packages/libethos/libethos.spec:1.2	Sat Apr 24 08:45:23 2010
+++ packages/libethos/libethos.spec	Sat Apr 24 10:36:43 2010
@@ -1,19 +1,29 @@
 # $Revision$, $Date$
+#
+# Conditional build
+%bcond_without	apidocs #disable gtk-doc
+#
 %define     _packname ethos
 Summary:	Reusable plugin framework for glib and gtk+
 Name:		libethos
 Version:	0.2.2
-Release:	1
+Release:	2
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://ftp.dronelabs.com/sources/%{_packname}/0.2/%{_packname}-%{version}.tar.gz
 # Source0-md5:	36cf1ef444a224556bba4d441c400300
 URL:		http://git.dronelabs.com/ethos/about/
 Patch0:		%{name}-pyc.patch
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake
 BuildRequires:	gjs-devel
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.7}
+BuildRequires:	intltool
+BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	python-pygobject-devel
 BuildRequires:	python-pygtk-devel
+BuildRequires:	rpm-pythonprov
 BuildRequires:	vala
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,28 +49,43 @@
 %description devel
 Header files for libethos library.
 
+%package apidocs
+Summary:	Ethos library API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki Ethos.
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Ethos library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Ethos.
+
 %prep
 %setup -q -n %{_packname}-%{version}
 %patch0 -p0
 
 %build
-./autogen.sh \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
-	--disable-static \
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+%configure \
 	--enable-introspection \
-	--enable-python \
-	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir}
-
-make
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -p -d $RPM_BUILD_ROOT/%{name}-%{version}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	HTML_DIR=%{_gtkdocdir}
+
+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
+
+%find_lang %{_packname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -69,10 +94,9 @@
 
 %postun	-p /sbin/ldconfig
 
-%files
+%files -f %{_packname}.lang
 %defattr(644,root,root,755)
 %doc COPYING AUTHORS README NEWS
-%doc %{_datadir}/doc/gtk-doc/html/ethos/*
 %attr(755,root,root) %{_libdir}/libethos*.so.*
 %dir %{_libdir}/ethos
 %dir %{_libdir}/ethos/plugin-loaders
@@ -83,22 +107,35 @@
 %{py_sitedir}/gtk-2.0/ethos
 %{py_sitedir}/gtk-2.0/_ethos*
 %{_datadir}/ethos/icons/*png
-%{_localedir}/*/LC_MESSAGES/ethos*
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/ethos-1.0
 %{_libdir}/ethos/plugin-loaders/lib*.so
+%{_libdir}/ethos/plugin-loaders/lib*.la
 %{_pkgconfigdir}/ethos*1.0.pc
 %{_libdir}/*.so
+%{_libdir}/*.la
 %{_datadir}/gir-1.0/Ethos-1.0.gir
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/%{_packname}
+%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.3  2010/04/24 08:36:43  deejay1
+- autofoo*
+- separate apidocs + bcond
+- some cleanups
+- rel. 2
+
 Revision 1.2  2010/04/24 06:45:23  deejay1
 - fix source URL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libethos/libethos.spec?r1=1.2&r2=1.3&f=u