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

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/pigment/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31807

Modified Files:
	pigment.spec 
Log Message:
Disable gtk-doc to fix multilib conflicts (#342871).



Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/devel/pigment.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pigment.spec	21 Dec 2008 13:27:08 -0000	1.14
+++ pigment.spec	22 Dec 2008 08:41:39 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Media Center Toolkit
 Name: pigment
 Version: 0.3.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
@@ -15,7 +15,7 @@
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: mesa-libGLU-devel
 Buildrequires: check
-BuildRequires: gtk-doc
+#BuildRequires: gtk-doc
 # Temporarily required for autoreconf
 BuildRequires: autoconf, automake, libtool
 
@@ -28,7 +28,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
-Requires: gtk-doc
+#Requires: gtk-doc
 # From pigment.pc
 Requires: glib2-devel
 Requires: gstreamer-devel
@@ -51,7 +51,7 @@
 
 %build
 %configure \
-    --enable-gtk-doc \
+    --disable-gtk-doc \
     --disable-static
 # Get rid of the /usr/lib64 RPATH on 64bit (still as of 0.3.4) ...NOT!
 # When removed, the "make check" fails.
@@ -65,6 +65,8 @@
 %{__make} install DESTDIR=%{buildroot}
 # Remove all *.la files
 find %{buildroot} -name '*.la' -exec rm -f {} \;
+# If gtk-doc is installed, these get built/installed anyway, so remove
+%{__rm} -rf %{buildroot}%{_datadir}/gtk-doc/html/pigment/ || :
 
 
 %check
@@ -93,10 +95,13 @@
 %{_libdir}/pkgconfig/pigment-0.3.pc
 %{_libdir}/pkgconfig/pigment-gtk-0.3.pc
 %{_libdir}/pkgconfig/pigment-imaging-0.3.pc
-%doc %{_datadir}/gtk-doc/html/pigment/
+#doc %{_datadir}/gtk-doc/html/pigment/
 
 
 %changelog
+* Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.3.13-2
+- Disable gtk-doc to fix multilib conflicts (#342871).
+
 * Thu Dec 18 2008 Matthias Saou <http://freshrpms.net/> 0.3.13-1
 - Update to 0.3.13.