rpms/libgalago/devel libgalago.spec,1.14,1.15

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	libgalago.spec 
Log Message:
* Wed Apr 02 2008 - Bastien Nocera <bnocera at redhat.com> - 0.5.2-7
- Don't generate the gtk-doc docs, and use the ones in the tarball
  to avoid having different files in different builds, fixes
  multilib problems (#342071)



Index: libgalago.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgalago/devel/libgalago.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libgalago.spec	9 Feb 2008 00:12:28 -0000	1.14
+++ libgalago.spec	2 Apr 2008 10:14:33 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		libgalago
 Version:	0.5.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Galago presence library
 
 Group:		System Environment/Libraries
@@ -42,7 +42,7 @@
 
 
 %build
-%configure --enable-static=no --enable-gtk-doc
+%configure --enable-static=no
 make %{?_smp_mflags}
 
 
@@ -51,6 +51,11 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Copy the files from the tarball to avoid the IDs generated by gtk-doc being
+# different on different builds
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgalago/
+cp -a docs/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libgalago/
+
 %find_lang %{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/galago
@@ -83,6 +88,11 @@
 
 
 %changelog
+* Wed Apr 02 2008 - Bastien Nocera <bnocera at redhat.com> - 0.5.2-7
+- Don't generate the gtk-doc docs, and use the ones in the tarball
+  to avoid having different files in different builds, fixes
+  multilib problems (#342071)
+
 * Fri Feb  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.5.2-6
 - Rebuild for gcc-4.3.