rpms/beryl-core/F-7 .cvsignore, 1.9, 1.10 beryl-core.spec, 1.17, 1.18 sources, 1.9, 1.10

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/beryl-core/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6896

Modified Files:
	.cvsignore beryl-core.spec sources 
Log Message:
Belated bump to 0.2.1, make ppc64 build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beryl-core/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Mar 2007 01:26:41 -0000	1.9
+++ .cvsignore	4 Jun 2007 21:35:54 -0000	1.10
@@ -8,3 +8,4 @@
 beryl-core-0.1.9999.1.tar.bz2
 beryl-core-0.1.9999.2.tar.bz2
 beryl-core-0.2.0.tar.bz2
+beryl-core-0.2.1.tar.bz2


Index: beryl-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beryl-core/F-7/beryl-core.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- beryl-core.spec	16 Mar 2007 01:26:41 -0000	1.17
+++ beryl-core.spec	4 Jun 2007 21:35:54 -0000	1.18
@@ -2,7 +2,7 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.2.0
+Version:        0.2.1
 Release:        1%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
@@ -12,7 +12,7 @@
 Patch0:         mesa-6.4.1-x86_64-fixes-1.patch
 
 # libdrm is not avaliable on these arches
-ExcludeArch:    s390 s390x ppc64
+ExcludeArch:    s390 s390x
 
 Requires:       mesa-libGL >= 6.5-9
 Requires(post): /sbin/ldconfig
@@ -27,6 +27,7 @@
 BuildRequires:  gettext-devel, libtool, intltool
 BuildRequires:  avahi-compat-libdns_sd-devel, freeglut-devel
 BuildRequires:  dbus-glib, dbus-devel, librsvg2-devel
+BuildRequires:  xorg-x11-proto-devel
 
 %description
 Beryl is a combined window manager and compositing
@@ -98,11 +99,17 @@
 
 %prep
 %setup -q -a 1
+sed -i 's|LIB_DIR = lib|LIB_DIR = %{_lib}|g' beryl-mesa/configs/default
+sed -i 's|EXTRA_LIB_PATH=-L/usr/lib|EXTRA_LIB_PATH=-L%{_libdir}|g' beryl-mesa/configs/current
+sed -i 's|/lib/libGL.a|/%{_lib}/libGL.a|g' src/Makefile.*
 
 
 %build
 pushd beryl-mesa/src
-make %{?_smp_mflags}
+%ifarch ppc64
+ARCH_FLAGS="-m64"
+%endif
+make ARCH_FLAGS=$ARCH_FLAGS %{?_smp_mflags}
 popd
 %configure --enable-xgl \
     --with-berylmesadir=./beryl-mesa \
@@ -162,6 +169,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Jun 04 2007 Jarod Wilson <jwilson at redhat.com> 0.2.1-1
+- belated update to 0.2.1
+- fix up ppc64 builds (#239183)
+
 * Thu Mar 15 2007 Jarod Wilson <jwilson at redhat.com> 0.2.0-1
 - beryl 0.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beryl-core/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Mar 2007 01:26:41 -0000	1.9
+++ sources	4 Jun 2007 21:35:54 -0000	1.10
@@ -1,2 +1,2 @@
 387d068091bc5c6fa28f6d754e1296d1  beryl-mesa-0.1.99.2.tar.bz2
-b937a4e6606d931c03d2014d08e9b096  beryl-core-0.2.0.tar.bz2
+895fe727d4396f6d51ffaf73cf8460d0  beryl-core-0.2.1.tar.bz2