diff --git a/.cvsignore b/.cvsignore index 96d9017..947810a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtkmm-2.10.9.tar.bz2 +gtkmm-2.10.10.tar.bz2 diff --git a/gtkmm.spec b/gtkmm.spec index 15dae77..27c21dd 100644 --- a/gtkmm.spec +++ b/gtkmm.spec @@ -1,5 +1,5 @@ Name: gtkmm24 -Version: 2.10.9 +Version: 2.10.10 Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -17,12 +17,14 @@ BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: glib2-devel >= 2.8.0 BuildRequires: cairomm-devel >= 1.1.12 + %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. Highlights include typesafe callbacks, widgets extensible via inheritance and a comprehensive set of widget classes that can be freely combined to quickly create complex user interfaces. + %package devel Summary: Headers for developing programs that will use %{name}. Group: Development/Libraries @@ -34,15 +36,18 @@ Requires: atk-devel Requires: pango-devel Requires: cairomm-devel + %description devel This package contains the static libraries and header files needed for developing gtkmm applications. + %package docs Summary: Documentation for %{name}, includes full API docs Group: Documentation Requires: %{name}-devel = %{version}-%{release} + %description docs This package contains the full API documentation for %{name}. @@ -57,12 +62,17 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT docs-to-include +rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -%{__mkdir} docs-to-include -%{__mv} ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4/* docs-to-include/ -rm -f ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/* + +# Fix documentation installation, put everything under gtk-doc +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4 +mv ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/ +mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/gtkmm-2.4/*.devhelp ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4 +sed -i 's:../../../doc/gtkmm-2.4/docs/:docs/:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/gtkmm-2.4/*.devhelp +rm -r ${RPM_BUILD_ROOT}%{_docdir}/gtkmm-2.4 + %clean rm -rf $RPM_BUILD_ROOT @@ -79,6 +89,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/*.so.* + %files devel %defattr(-, root, root, -) %doc CHANGES PORTING @@ -92,12 +103,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gdkmm-2.4 %{_libdir}/pkgconfig/*.pc + %files docs %defattr(-, root, root, -) -%doc docs-to-include/* +%doc %{_datadir}/gtk-doc/html/gtkmm-2.4 %changelog +* Tue Jul 10 2007 Denis Leroy - 2.10.10-1 +- Update to 2.10.10, memory leak fix +- Fixed documentation devhelp support + * Mon Apr 30 2007 Denis Leroy - 2.10.9-1 - Update to 2.10.9 diff --git a/sources b/sources index 3e0e5d1..203820c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12d43465441b3b58008169d416ffa7df gtkmm-2.10.9.tar.bz2 +c86ccbed9735be84689baac2f38015bf gtkmm-2.10.10.tar.bz2