rpms/libsigc++20/devel .cvsignore, 1.8, 1.9 libsigc++.spec, 1.20, 1.21 sources, 1.9, 1.10
Denis Leroy
denis at fedoraproject.org
Sun Aug 30 07:09:03 UTC 2009
Author: denis
Update of /cvs/pkgs/rpms/libsigc++20/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13620
Modified Files:
.cvsignore libsigc++.spec sources
Log Message:
- Update to upstream 2.2.4.1
- Added devhelp book and necessary BRs
- Split documentation into new subpackage
- Moved documentation to gtk-doc dir
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 11 Mar 2008 11:24:35 -0000 1.8
+++ .cvsignore 30 Aug 2009 07:09:02 -0000 1.9
@@ -1 +1 @@
-libsigc++-2.2.2.tar.bz2
+libsigc++-2.2.4.1.tar.bz2
Index: libsigc++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/libsigc++.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libsigc++.spec 25 Jul 2009 08:38:07 -0000 1.20
+++ libsigc++.spec 30 Aug 2009 07:09:02 -0000 1.21
@@ -1,6 +1,6 @@
Name: libsigc++20
-Version: 2.2.2
-Release: 4%{?dist}
+Version: 2.2.4.1
+Release: 1%{?dist}
Summary: Typesafe signal framework for C++
@@ -9,9 +9,8 @@ License: LGPLv2+
URL: http://libsigc.sourceforge.net/
Source0: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: doxygen graphviz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
BuildRequires: m4
%description
@@ -41,29 +40,40 @@ needed for development with %name.
%setup -q -n libsigc++-%{version}
+%package doc
+Summary: Documentation for %{name}, includes full API docs
+Group: Documentation
+
+
+%description doc
+This package contains the full API documentation for %{name}.
+
+
%build
%configure %{!?_with_static: --disable-static}
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT docs-to-include
+rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%{__mkdir} docs-to-include
-%{__mv} ${RPM_BUILD_ROOT}%{_docdir}/libsigc-2.0/* docs-to-include/
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html
+mv ${RPM_BUILD_ROOT}%{_datadir}/doc/libsigc++-2.0 ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html
+mv ${RPM_BUILD_ROOT}%{_datadir}/devhelp/books/libsigc++-2.0/* ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libsigc++-2.0/
+# Fix documentation link in devhelp file, since we moved the docs to
+# the gtk-doc directory.
+sed -i 's:/usr/share/doc:/usr/share/gtk-doc/html:' ${RPM_BUILD_ROOT}%{_datadir}/gtk-doc/html/libsigc++-2.0/*.devhelp2
+
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
-%postun
-/sbin/ldconfig
-
+%postun -p /sbin/ldconfig
%files
@@ -71,16 +81,28 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING README NEWS ChangeLog TODO
%{_libdir}/*.so.*
+
%files devel
%defattr(-,root,root,-)
-%doc docs-to-include/*
%{_includedir}/*
%{_libdir}/sigc++-2.0
%{_libdir}/pkgconfig/*.pc
%{?_with_static: %{_libdir}/*.a}
%{_libdir}/*.so
+
+%files doc
+%defattr(-, root, root, -)
+%doc %{_datadir}/gtk-doc/html/libsigc++-2.0
+
+
%changelog
+* Sat Aug 29 2009 Denis Leroy <denis at poolshark.org> - 2.2.4.1-1
+- Update to upstream 2.2.4.1
+- Added devhelp book and necessary BRs
+- Split documentation into new subpackage
+- Moved documentation to gtk-doc dir
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libsigc++20/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 11 Mar 2008 11:24:35 -0000 1.9
+++ sources 30 Aug 2009 07:09:02 -0000 1.10
@@ -1 +1 @@
-962493fd6b26425f21504c3416c4efa1 libsigc++-2.2.2.tar.bz2
+3a362dbcd23a9c3bcb2a257fac8a9466 libsigc++-2.2.4.1.tar.bz2
More information about the fedora-extras-commits
mailing list