- added ca locale

- individual tools invocation instead of autoreconf

Changed files:
    beryl-settings.spec -> 1.10

diff --git a/beryl-settings.spec b/beryl-settings.spec
index ac5713a22726466356a970cbc7bdc8598aaeb7b9..cda4c1a650040905e0c76fb2bc9a7d2c96aa8e67 100644 (file)
--- a/beryl-settings.spec
+++ b/beryl-settings.spec
@@ -9,7 +9,7 @@ Group:          X11/Window Managers/Tools
 Source0:       http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: bd88d56f32b23d42d44c85a92f0654f3
 BuildRequires: autoconf >= 2.57
-BuildRequires: automake
+BuildRequires: automake >= 1:1.9
 BuildRequires: beryl-core-devel >= 1:0.1.3
 BuildRequires: dbus-glib-devel >= 0.50
 BuildRequires: gtk+2-devel >= 2:2.8.0
@@ -17,6 +17,8 @@ BuildRequires:        intltool >= 0.35.0
 BuildRequires: pkgconfig
 Requires:      beryl-core >= 1:0.1.3
 Requires:      beryl-plugins >= 1:0.1.3
+Obsoletes:     compiz-settings-manager
+Obsoletes:     csm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,6 +29,7 @@ Narz
 
 %prep
 %setup -q
+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
@@ -35,9 +38,11 @@ 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
+# sv_FI is identical to sv_SE
 
 # NOTE: check the list ofter any upgrade!
 cat > po/LINGUAS <<EOF
+ca
 es
 es_AR
 fr
@@ -54,9 +59,12 @@ zh_TW
 EOF
 
 %build
-autoreconf -v --install
 %{__intltoolize}
 %{__glib_gettextize} --copy --force
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}