rpms/glibmm24/devel glibmm.spec,1.22,1.23

Denis Leroy (denis) fedora-extras-commits at redhat.com
Thu Jun 21 22:13:28 UTC 2007


Author: denis

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4037

Modified Files:
	glibmm.spec 
Log Message:
Moved documentation to devhelp directory


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- glibmm.spec	21 Jun 2007 14:56:17 -0000	1.22
+++ glibmm.spec	21 Jun 2007 22:12:52 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           glibmm24
 Version:        2.13.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -40,11 +40,14 @@
 
 
 %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}/glibmm-2.4/* docs-to-include/
+
+# 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/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,22 +61,25 @@
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README CHANGES
 %{_libdir}/*.so.*
 
 
 %files devel
 %defattr(-, root, root, -)
-%doc CHANGES docs-to-include/*
 %{_includedir}/glibmm-2.4
 %{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 %{_libdir}/glibmm-2.4
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/*.m4
+%doc %{_datadir}/gtk-doc/html/glibmm-2.4
 
 
 %changelog
+* Fri Jun 22 2007 Denis Leroy <denis at poolshark.org> - 2.13.6-2
+- Moved documentation to devhelp directory
+
 * Thu Jun 21 2007 Denis Leroy <denis at poolshark.org> - 2.13.6-1
 - Update to unstable 2.13 tree to follow glib2 version
 




More information about the fedora-extras-commits mailing list