diff --git a/.gitignore b/.gitignore index 93f597a..1040023 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ glibmm-2.24.1.tar.bz2 /glibmm-2.27.4.tar.bz2 /glibmm-2.27.91.tar.bz2 /glibmm-2.27.93.tar.bz2 +/glibmm-2.27.94.tar.bz2 diff --git a/glibmm24.spec b/glibmm24.spec index 8584b2a..c6ae0c4 100644 --- a/glibmm24.spec +++ b/glibmm24.spec @@ -1,8 +1,10 @@ +%global tarname glibmm +%global api_ver 2.4 # first two digits of version %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: glibmm24 -Version: 2.27.93 +Version: 2.27.94 Release: 1%{?dist} Summary: C++ interface for the GLib library @@ -40,7 +42,7 @@ Summary: Documentation for %{name}, includes full API docs Group: Documentation BuildArch: noarch Requires: %{name} = %{version}-%{release} - +Requires: libsigc++20-doc %description doc This package contains the full API documentation for %{name}. @@ -66,15 +68,6 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf tools find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -# Fix documentation installation, put everything under gtk-doc -mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4 -mv ${RPM_BUILD_ROOT}%{_docdir}/glibmm-2.4/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/ -mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/glibmm-2.4/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/glibmm-2.4/ -# Fix devhelp broken base tag -sed -i 's:base="[^\"]*":base="/usr/share/gtk-doc/html/glibmm-2.4/reference/html":' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/glibmm-2.4/*.devhelp2 -# Remove old doc directory -rm -fr ${RPM_BUILD_ROOT}%{_datadir}/doc/glibmm-2.4 - %clean rm -rf $RPM_BUILD_ROOT @@ -107,10 +100,15 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-, root, root, -) -%{_datadir}/gtk-doc/ - +%doc %{_docdir}/%{tarname}-%{api_ver}/* +%{_datadir}/devhelp/ %changelog +* Mon Feb 21 2011 Haïkel Guémar - 2.27.94-1 +- upstream 2.27.94 +- fix documentation location +- co-own /usr/share/devhelp + * Thu Feb 03 2011 Kalev Lember - 2.27.93-1 - Update to 2.27.93 diff --git a/sources b/sources index 28b34b7..808e058 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ec073bf82ee07fbcefb0ad8979765e7 glibmm-2.27.93.tar.bz2 +3d235a895c0093bd667fadca92d16950 glibmm-2.27.94.tar.bz2