rpms/beryl-core/devel .cvsignore, 1.2, 1.3 beryl-core.spec, 1.4, 1.5 sources, 1.2, 1.3

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4036

Modified Files:
	.cvsignore beryl-core.spec sources 
Log Message:
Update to 0.1.3 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Nov 2006 20:31:35 -0000	1.2
+++ .cvsignore	13 Dec 2006 04:24:19 -0000	1.3
@@ -1 +1,2 @@
 beryl-core-0.1.2.tar.bz2
+beryl-core-0.1.3.tar.bz2


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beryl-core.spec	21 Nov 2006 20:24:12 -0000	1.4
+++ beryl-core.spec	13 Dec 2006 04:24:19 -0000	1.5
@@ -2,8 +2,8 @@
 Url:            http://www.beryl-project.org/
 License:        GPL
 Group:          User Interface/Desktops
-Version:        0.1.2
-Release:        6%{?dist}
+Version:        0.1.3
+Release:        1%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,26 +97,27 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .mesa64
+#patch0 -p0 -b .mesa64
 # Somebody hosed up the release tarball...
-find mesa/src -name "*.o" | xargs rm -f
+#find mesa/src -name "*.o" | xargs rm -f
 
 
 %build
-%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
-#make %{?_smp_mflags}
-make
+# --disable-berylmesa == don't build beryl-xgl
+%configure --disable-berylmesa \
+    --x-includes=%{_includedir}/X11/ \
+    --x-libraries=%{_libdir}/X11/
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Kill static lib and libtool lib
-rm -f $RPM_BUILD_ROOT%{_libdir}/libberylsettings.{a,la}
-
+# Kill static and libtool libs
+find $RPM_BUILD_ROOT -type f -name "*.a" -o -name "*.la" | xargs rm -f
+# --disable-berylmesa should have made this not install...
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/beryl-xgl.1*
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,15 +126,17 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/beryl*
 %dir %{_datadir}/beryl
+%dir %{_libdir}/beryl/backends
 %{_datadir}/beryl/*.png
 %{_mandir}/man1/beryl*
 %{_libdir}/libberylsettings.so.0
 %{_libdir}/libberylsettings.so.0.0.0
+%{_libdir}/beryl/backends/*.so
 
 
 %files devel
@@ -154,10 +157,12 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Dec 12 2006 Jarod Wilson <jwilson at redhat.com> 0.1.3-1
+- New upstream release
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2006 20:31:35 -0000	1.2
+++ sources	13 Dec 2006 04:24:19 -0000	1.3
@@ -1 +1 @@
-045aceb6e48e997c952d942fbe841e76  beryl-core-0.1.2.tar.bz2
+24caed8a8cb50fd30823a9ee182f85f4  beryl-core-0.1.3.tar.bz2