SPECS: beryl-settings.spec - added ca locale - individual tools in...

[qboosh]

Author: qboosh                       Date: Sun Dec 10 17:39:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added ca locale
- individual tools invocation instead of autoreconf

---- Files affected:
SPECS:
   beryl-settings.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/beryl-settings.spec
diff -u SPECS/beryl-settings.spec:1.9 SPECS/beryl-settings.spec:1.10
--- SPECS/beryl-settings.spec:1.9	Sun Dec 10 13:29:02 2006
+++ SPECS/beryl-settings.spec	Sun Dec 10 18:39:45 2006
@@ -10,7 +10,7 @@
 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
@@ -18,6 +18,8 @@
 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
@@ -28,6 +30,7 @@
 
 %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
@@ -36,9 +39,11 @@
 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
@@ -55,9 +60,12 @@
 EOF
 
 %build
-autoreconf -v --install
 %{__intltoolize}
 %{__glib_gettextize} --copy --force
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
@@ -84,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/12/10 17:39:45  qboosh
+- added ca locale
+- individual tools invocation instead of autoreconf
+
 Revision 1.9  2006/12/10 12:29:02  qboosh
 - locale fixes, epoch 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/beryl-settings.spec?r1=1.9&r2=1.10&f=u