rpms/pigment/F-10 .cvsignore, 1.11, 1.12 pigment.spec, 1.12, 1.13 sources, 1.11, 1.12

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/pigment/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8651/F-10

Modified Files:
	.cvsignore pigment.spec sources 
Log Message:
Update to 0.3.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	7 Oct 2008 12:32:21 -0000	1.11
+++ .cvsignore	22 Dec 2008 09:36:25 -0000	1.12
@@ -1 +1 @@
-pigment-0.3.11.tar.bz2
+pigment-0.3.13.tar.bz2


Index: pigment.spec
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-10/pigment.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pigment.spec	7 Oct 2008 12:32:22 -0000	1.12
+++ pigment.spec	22 Dec 2008 09:36:25 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Media Center Toolkit
 Name: pigment
-Version: 0.3.11
-Release: 1%{?dist}
+Version: 0.3.13
+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
@@ -45,12 +45,13 @@
 %prep
 %setup -q
 # Required to get 0.3.6 working. Some lib64 problems.
-autoreconf
+# Try disabling in 0.3.13 on f11 because of libtool build problems
+#autoreconf
 
 
 %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.
@@ -64,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
@@ -92,10 +95,19 @@
 %{_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.
+
+* Tue Nov 11 2008 Matthias Saou <http://freshrpms.net/> 0.3.12-1
+- Update to 0.3.12.
+
 * Tue Oct  7 2008 Matthias Saou <http://freshrpms.net/> 0.3.11-1
 - Update to 0.3.11.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pigment/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Oct 2008 12:32:22 -0000	1.11
+++ sources	22 Dec 2008 09:36:26 -0000	1.12
@@ -1 +1 @@
-b5ee22ebab3be807049eeb2a290b7a89  pigment-0.3.11.tar.bz2
+38ca3c80dcb69b0167c16e707cea0f35  pigment-0.3.13.tar.bz2