rpms/libsexy/devel libsexy.spec,1.18,1.19

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	libsexy.spec 
Log Message:
* Wed Apr  2 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-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 (#342361)



Index: libsexy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsexy/devel/libsexy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libsexy.spec	26 Mar 2008 00:56:30 -0000	1.18
+++ libsexy.spec	2 Apr 2008 22:50:48 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           libsexy
 Version:        0.1.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
@@ -12,7 +12,6 @@
 BuildRequires:  gtk2-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	iso-codes-devel
-BuildRequires:	gtk-doc
 Requires:	enchant
 Requires:	hunspell-en
 
@@ -39,7 +38,7 @@
 
 
 %build
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -48,6 +47,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/%{name}/
+cp -a docs/reference/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/%{name}/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +78,11 @@
 
 
 %changelog
+* Wed Apr  2 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-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 (#342361)
+
 * Tue Mar 25 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.1.11-6
 - Switch back require to enchant. (#437797)