rpms/beryl-core/FC-6 beryl-core.spec,1.3,1.4

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28023

Modified Files:
	beryl-core.spec 
Log Message:
Disable R: on vidcap pkg until its in FE, fix up some GL library linking, fix R:/BR: on mesa-libGL-devel


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beryl-core.spec	16 Nov 2006 23:22:54 -0000	1.3
+++ beryl-core.spec	21 Nov 2006 20:28:51 -0000	1.4
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
 BuildRequires:  libXt-devel, libXmu-devel, libICE-devel, libSM-devel
-BuildRequires:  libXinerama-devel
+BuildRequires:  libXinerama-devel, mesa-libGL-devel >= 6.5-9
 BuildRequires:  startup-notification-devel >= 0.7
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
@@ -46,6 +46,7 @@
 Requires: libXdamage-devel, libXcomposite-devel >= 0.3
 Requires: libXext-devel, libXinerama-devel, libXrandr-devel
 Requires: libSM-devel, libpng-devel, startup-notification-devel
+Requires: mesa-libGL-devel >= 6.5-9
 
 %description devel
 The beryl-core-devel package includes the header
@@ -70,7 +71,7 @@
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
 Requires: beryl-plugins >= %{version}, beryl-dbus >= %{version}
-Requires: beryl-vidcap >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: heliodor >= %{version}
 
@@ -84,7 +85,8 @@
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
-Requires: beryl-plugins >= %{version}, beryl-vidcap >= %{version}
+Requires: beryl-plugins >= %{version}
+#Requires: beryl-vidcap >= %{version}
 Requires: emerald >= %{version}, emerald-themes >= %{version}
 Requires: aquamarine >= %{version}
 
@@ -101,7 +103,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir}/X11/ --x-libraries=%{_libdir}/X11/
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -152,6 +154,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 21 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-6
+- Dump R: beryl-vidcap until its into FE
+- Fix up GL library linking to resolve some undefined symbols
+- R: and BR: for mesa-libGL-devel
+
 * Thu Nov 16 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-5
 - Add BR: libXinerama-devel
 - Fix up R: for beryl-core-devel