- restored nl lang

[packages/beryl-core.git] / beryl-core.spec

diff --git a/beryl-core.spec b/beryl-core.spec
index 3f89d65bbe5dc1e0dce51bbc5a189adbc62865aa..54284039d2272d74b077667193527c28b40fc069 100644 (file)
--- a/beryl-core.spec
+++ b/beryl-core.spec
@@ -1,19 +1,19 @@
 #
 # Conditional build:
-%bcond_without beryl_mesa      # build beryl-xgl statically linked with own libGL 
+%bcond_without beryl_mesa      # beryl-xgl statically linked with own libGL
 #
 Summary:       OpenGL window and compositing manager
 Summary(pl):   OpenGL-owy zarz±dca okien i sk³adania
 Name:          beryl-core
-Version:       0.1.3
+Version:       0.1.99.2
 Release:       1
 Epoch:         1
 License:       MIT
 Group:         X11
 Source0:       http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 24caed8a8cb50fd30823a9ee182f85f4
+# Source0-md5: e439403ce19130e37f46185a65465c9b
 Source1:       http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2
-# Source1-md5: c22765c2637846907ee6154b548151e9
+# Source1-md5: 387d068091bc5c6fa28f6d754e1296d1
 Patch0:                %{name}-link.patch
 URL:           http://beryl-project.org/
 BuildRequires: GConf2-devel >= 2.0
@@ -34,7 +34,9 @@ BuildRequires:        xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXrandr-devel
 BuildRequires: xorg-proto-glproto-devel
 BuildRequires: xorg-util-makedepend
+Requires:      xorg-app-xvinfo
 Provides:      compiz
+Obsoletes:     compiz-quinnstorm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,6 +75,7 @@ Requires:     xorg-lib-libXdamage-devel
 Requires:      xorg-lib-libXinerama-devel
 Requires:      xorg-lib-libXrandr-devel
 Requires:      xorg-proto-glproto-devel
+Obsoletes:     compiz-quinnstorm-devel
 
 %description devel
 Header files for beryl.
@@ -80,11 +83,24 @@ Header files for beryl.
 %description devel -l pl
 Pliki nag³ówkowe dla beryla.
 
+%package gconf
+Summary:       GConf settings plugin for beryl
+Summary(pl):   Wtyczka ustawieñ GConf dla beryla
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description gconf
+GConf settings plugin for beryl.
+
+%description gconf -l pl
+Wtyczka ustawieñ GConf dla beryla.
+
 %prep
 %setup -q %{?with_beryl_mesa: -a1}
 %patch0 -p1
 
 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/{hu_HU,hu}.po
@@ -92,12 +108,15 @@ 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/{ru_RU,ru}.po
 mv -f po/{sv_SE,sv}.po
+mv -f po/{uk_UA,uk}.po
 # sv_FI is identical to sv_SE
 
-# NOTE: check the list ofter any upgrade!
+# NOTE: check the list after any upgrade!
 cat > po/LINGUAS <<EOF
 ca
+de
 es
 es_AR
 fr
@@ -105,9 +124,13 @@ hu
 it
 ja
 ko
+nl
+pl
 pt_BR
 pt
+ru
 sv
+uk
 zh_CN
 zh_HK
 zh_TW
@@ -127,7 +150,9 @@ sed -i -e 's@^#! /bin/sh$@#!/bin/bash@' configure
 
 %configure \
        %{?with_beryl_mesa:--with-berylmesadir=beryl-mesa} \
-       --disable-static
+       --disable-static \
+       --enable-gconf
+
 %{__make}
 
 %install
@@ -153,10 +178,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS README TODO
 %attr(755,root,root) %{_bindir}/beryl
+%attr(755,root,root) %{_bindir}/beryl-settings-tool
+%attr(755,root,root) %{_libdir}/libberyldecoration.so.*.*.*
 %attr(755,root,root) %{_libdir}/libberylsettings.so.*.*.*
 %dir %{_libdir}/beryl
 %dir %{_libdir}/beryl/backends
-%attr(755,root,root) %{_libdir}/beryl/backends/*.so
+%attr(755,root,root) %{_libdir}/beryl/backends/libini.so
 %{_datadir}/beryl
 %{_mandir}/man1/beryl.1*
 %if %{with beryl_mesa}
@@ -166,9 +193,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libberyldecoration.so
 %attr(755,root,root) %{_libdir}/libberylsettings.so
+%{_libdir}/libberyldecoration.la
 %{_libdir}/libberylsettings.la
 %{_includedir}/beryl
 %{_pkgconfigdir}/beryl.pc
 %{_pkgconfigdir}/berylsettings.pc
+%{_pkgconfigdir}/libberyldecoration.pc
 %{_mandir}/man3/*.3*
+
+%files gconf
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/beryl/backends/libgconf.so