- locales cleanup, added URL

- individual tools invocation instead of autoreconf
- Obsoletes: compiz-manager

Changed files:
    beryl-manager.spec -> 1.10

diff --git a/beryl-manager.spec b/beryl-manager.spec
index 53e1cd2fc81ff15368fdc257631fd83828bb4c71..37bc8fab70591740c00c2cd82eff8204981a8f72 100644 (file)
--- a/beryl-manager.spec
+++ b/beryl-manager.spec
@@ -8,12 +8,14 @@ License:      LGPL v2+
 Group:         X11/Window Managers/Tools
 Source0:       http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: c9559154c20db1bb41d3d480cfdf0299
+URL:           http://beryl-project.org/
 BuildRequires: autoconf >= 2.57
-BuildRequires: automake
+BuildRequires: automake >= 1:1.9
 BuildRequires: gtk+2-devel >= 2:2.8.0
 BuildRequires: intltool >= 0.35.0
 BuildRequires: pkgconfig
 Requires:      beryl-core >= 1:0.1.3
+Obsoletes:     compiz-manager
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,26 +27,35 @@ Aplikacja do uruchamiania i zarz
 %prep
 %setup -q
 mv -f po/{ar_AR,ar}.po
+mv -f po/{ca_ES,ca}.po
 mv -f po/{de_DE,de}.po
 mv -f po/{es_ES,es}.po
 mv -f po/{fr_FR,fr}.po
+mv -f po/{gl_ES,gl}.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/{my_MY,my}.po
+mv -f po/{nl_NL,nl}.po
 mv -f po/{pt_PT,pt}.po
 mv -f po/{ru_RU,ru}.po
 mv -f po/{sk_SK,sk}.po
 mv -f po/{sv_SE,sv}.po
+mv -f po/{tr_TR,tr}.po
+# gl_GL is outdated and looks bogus 
+# nl_BE is identical to nl_NL
+# 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
 de
-en_US
 es
+es_AR
 fr
+gl
 hu
 it
 ja
@@ -56,15 +67,19 @@ pt
 ru
 sk
 sv
+tr
 zh_CN
 zh_HK
 zh_TW
 EOF
 
 %build
-autoreconf -v --install
 %{__intltoolize}
 %{__glib_gettextize} --copy --force
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        --disable-mime-update
 %{__make}
@@ -82,5 +97,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{_iconsdir}/*/*/*/beryl-manager.*
-%{_pixmapsdir}/*
+%{_pixmapsdir}/*.png
 %{_mandir}/man1/*.1*