SPECS: beryl-core.spec - up to new 0.1.3 - beryl_mesa flag added -...

[rotom]

Author: rotom                        Date: Sun Dec 10 09:39:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to new 0.1.3
- beryl_mesa flag added
- now mesa package isn't necessary

---- Files affected:
SPECS:
   beryl-core.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/beryl-core.spec
diff -u SPECS/beryl-core.spec:1.12 SPECS/beryl-core.spec:1.13
--- SPECS/beryl-core.spec:1.12	Sun Dec  3 18:45:21 2006
+++ SPECS/beryl-core.spec	Sun Dec 10 10:39:28 2006
@@ -2,19 +2,19 @@
 #
 # TODO: python
 #
+%bcond_with     beryl_mesa
+
 Summary:	OpenGL window and compositing manager
 Summary(pl):	OpenGL-owy zarządca okien i składania
 Name:		beryl-core
-Version:	20061201
+Version:	0.1.3
 Release:	1
 License:	MIT
 Group:		X11
-#Source0:	http://distfiles.xgl-coffee.org/beryl-core/%{name}-%{version}.tar.bz2
-Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	5c0ac3fcc25e8e3936e854dcff5d1b05
-Source1:	beryl-mesa-%{version}.tar.bz2
-# Source1-md5:	c9a58134b47f871daefe815d9c7b5692
-Patch0:		%{name}-aiglx.patch
+Source0:	http://releases.beryl-project.org/0.1.3/%{name}-%{version}.tar.bz2
+# Source0-md5:	24caed8a8cb50fd30823a9ee182f85f4
+%{?with_beryl_mesa:Source1:	http://releases.beryl-project.org/0.1.3/beryl-mesa-%{version}.tar.bz2}
+# Source1-md5:	c22765c2637846907ee6154b548151e9
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 2.0
@@ -76,10 +76,36 @@
 Pliki nagłówkowe dla beryla.
 
 %prep
-%setup -q -a1 -n %{name}
-%patch0 -p1
+%setup -q %{?with_beryl_mesa: -a1}
+mv -f po/{es_AR,ar}.po
+mv -f po/{es_ES,es}.po
+mv -f po/{fr_FR,fr}.po
+mv -f po/{hu_HU,hu}.po
+mv -f po/{it_IT,it}.po
+mv -f po/{ja_JP,ja}.po
+mv -f po/{ko_KR,ko}.po
+mv -f po/{pt_PT,pt}.po
+mv -f po/{sv_SE,sv}.po
+
+    # NOTE: check the list ofter any upgrade!
+cat > po/LINGUAS <<EOF
+ar
+es
+fr
+hu
+it
+ja
+ko
+pt_BR
+pt
+sv
+zh_CN
+zh_HK
+zh_TW
+EOF
 
 %build
+sed -i 's/bin_PROGRAMS = beryl beryl-settings-dump beryl-xgl/bin_PROGRAMS = beryl beryl-settings-dump/' src/Makefile.am
 autoreconf -v --install
 %{__glib_gettextize}
 intltoolize --automake --copy --force
@@ -88,8 +114,8 @@
 sed -i -e 's@^#! /bin/sh$@#!/bin/bash@' configure
 
 %configure \
-	--disable-static \
-	--with-berylmesadir=beryl-mesa
+	%{?with_beryl_mesa:--with-berylmesadir=beryl-mesa} \
+	--disable-static
 %{__make}
 
 %install
@@ -117,11 +143,14 @@
 %{_libdir}/beryl/backends/*.la
 %{_datadir}/beryl
 %{_mandir}/man1/*
+%{_libdir}/beryl/backends
+%{_libdir}/beryl/backends/*.so
 
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/*.so
 %{_libdir}/*.la
+%{_libdir}/beryl/backends/*.la
 %{_includedir}/beryl
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man3/*.3*
@@ -132,6 +161,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/12/10 09:39:28  rotom
+- up to new 0.1.3
+- beryl_mesa flag added
+- now mesa package isn't necessary
+
 Revision 1.12  2006/12/03 17:45:21  wolf
 - 20061201
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/beryl-core.spec?r1=1.12&r2=1.13&f=u