SPECS: beryl-core.spec - locale fixes, updated some BRs - individu...

[qboosh]

Author: qboosh                       Date: Sun Dec 10 12:26:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- locale fixes, updated some BRs
- individual tool invocations instead of autoreconf (which omits force)

---- Files affected:
SPECS:
   beryl-core.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/beryl-core.spec
diff -u SPECS/beryl-core.spec:1.16 SPECS/beryl-core.spec:1.17
--- SPECS/beryl-core.spec:1.16	Sun Dec 10 13:05:48 2006
+++ SPECS/beryl-core.spec	Sun Dec 10 13:25:55 2006
@@ -17,10 +17,11 @@
 # Source0-md5:	24caed8a8cb50fd30823a9ee182f85f4
 Source1:	http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2
 # Source1-md5:	c22765c2637846907ee6154b548151e9
+BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	autoconf >= 2.57
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	glib2-devel >= 2.0
-BuildRequires:	intltool
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libpng-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
@@ -61,7 +62,7 @@
 %package devel
 Summary:	Header files for beryl
 Summary(pl):	Pliki nagłówkowe dla beryla
-Group:		Development
+Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	OpenGL-devel
 Requires:	libpng-devel
@@ -80,7 +81,7 @@
 
 %prep
 %setup -q %{?with_beryl_mesa: -a1}
-mv -f po/{es_AR,ar}.po
+mv -f po/{ca_ES,ca}.po
 mv -f po/{es_ES,es}.po
 mv -f po/{fr_FR,fr}.po
 mv -f po/{hu_HU,hu}.po
@@ -89,11 +90,13 @@
 mv -f po/{ko_KR,ko}.po
 mv -f po/{pt_PT,pt}.po
 mv -f po/{sv_SE,sv}.po
+# sv_FI is identical to sv_SE
 
-    # NOTE: check the list ofter any upgrade!
+# NOTE: check the list ofter any upgrade!
 cat > po/LINGUAS <<EOF
-ar
+ca
 es
+es_AR
 fr
 hu
 it
@@ -107,11 +110,16 @@
 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
+
+%build
 %{__glib_gettextize}
 %{__intltoolize} --automake
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 
 # bashisms inside
 sed -i -e 's@^#! /bin/sh$@#!/bin/bash@' configure
@@ -162,6 +170,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/12/10 12:25:55  qboosh
+- locale fixes, updated some BRs
+- individual tool invocations instead of autoreconf (which omits force)
+
 Revision 1.16  2006/12/10 12:05:48  darekr
 - BR sed4
 
================================================================

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