+#
+# Conditional build:
+%bcond_with 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
+Summary(pl.UTF-8): OpenGL-owy zarządca okien i składania
Name: beryl-core
-Version: 0.1.0
+Version: 0.2.0
Release: 1
-License: GPL/MIT
+Epoch: 1
+License: MIT
Group: X11
-Source0: http://distfiles.xgl-coffee.org/beryl-core/%{name}-%{version}.tar.bz2
-# Source0-md5: 17fc446a78c557e02417b85ce7ea29e1
-Patch0: beryl-core-aiglx.patch
+Source0: http://releases.beryl-project.org/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: b937a4e6606d931c03d2014d08e9b096
+#Source1: http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2
+## Source1-md5: 387d068091bc5c6fa28f6d754e1296d1
+Patch0: %{name}-link.patch
+URL: http://beryl-project.org/
+BuildRequires: GConf2-devel >= 2.0
+BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
-BuildRequires: automake
-BuildRequires: intltool
+BuildRequires: automake >= 1:1.9
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: intltool >= 0.35.0
BuildRequires: libpng-devel
BuildRequires: libtool
-BuildRequires: startup-notification-devel
-BuildRequires: xorg-lib-libXcomposite-devel
+BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
+BuildRequires: startup-notification-devel >= 0.7
+BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libXcomposite-devel >= 0.3
BuildRequires: xorg-lib-libXdamage-devel
+BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXrandr-devel
+BuildRequires: xorg-lib-libXrender-devel >= 0.8.4
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
Some parts were optimized for speed and there were added few
additional plugins and patches, delivering even more eyecandy.
-%description -l pl
-Beryl jest OpenGL-owym zarz±dc± sk³adania, u¿ywaj±cym rozszerzenia
-GLX_EXT_texture_from_pixmap w celu wi±zania przekierowanych okien do
+%description -l pl.UTF-8
+Beryl jest OpenGL-owym zarządcą składania, używającym rozszerzenia
+GLX_EXT_texture_from_pixmap w celu wiązania przekierowanych okien do
tekstur. Posiada elastyczny system wtyczek i jest tak zaprojektowany,
-by dobrze dzia³aæ na wiêkszo¶ci kart graficznych.
+by dobrze działać na większości kart graficznych.
-To jest udoskonalona wersja compiza, tworzona g³ównie przez
-Quinnstorma. Niektóre czê¶ci zosta³y zoptymalizowane pod wzglêdem
-prêdko¶ci oraz dodano kilka dodatkowych wtyczek i ³atek,
-dostarczaj±cych jeszcze wiêcej ¶wiecide³ek.
+To jest udoskonalona wersja compiza, tworzona głównie przez
+Quinnstorma. Niektóre części zostały zoptymalizowane pod względem
+prędkości oraz dodano kilka dodatkowych wtyczek i łatek,
+dostarczających jeszcze więcej świecidełek.
%package devel
Summary: Header files for beryl
-Summary(pl): Pliki nag³ówkowe dla beryla
-Group: Development
-Requires: OpenGL-devel
+Summary(pl.UTF-8): Pliki nagłówkowe dla beryla
+Group: X11/Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: OpenGL-GLX-devel
+Requires: glib2-devel >= 2.0
Requires: libpng-devel
Requires: startup-notification-devel >= 0.7
Requires: xorg-lib-libSM-devel
-Requires: xorg-lib-libXcomposite-devel
+Requires: xorg-lib-libXcomposite-devel >= 0.3
Requires: xorg-lib-libXdamage-devel
+Requires: xorg-lib-libXinerama-devel
Requires: xorg-lib-libXrandr-devel
-Conflicts: compiz-devel
+Requires: xorg-lib-libXrender-devel >= 0.8.4
+Requires: xorg-proto-glproto-devel
+Obsoletes: compiz-quinnstorm-devel
%description devel
Header files for beryl.
-%description devel -l pl
-Pliki nag³ówkowe dla beryla.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla beryla.
+
+%package gconf
+Summary: GConf settings plugin for beryl
+Summary(pl.UTF-8): Wtyczka ustawień GConf dla beryla
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description gconf
+GConf settings plugin for beryl.
+
+%description gconf -l pl.UTF-8
+Wtyczka ustawień GConf dla beryla.
%prep
-%setup -q -n %{name}
+%setup -q %{?with_beryl_mesa: -a1}
%patch0 -p1
+mv -f po/{de_DE,de}.po
+mv -f po/{hu_HU,hu}.po
+mv -f po/{pt_PT,pt}.po
+mv -f po/{sv_SE,sv}.po
+mv -f po/{uk_UA,uk}.po
+
+# NOTE: check the list after any upgrade!
+cat > po/LINGUAS <<EOF
+ca
+cs
+de
+es
+es_AR
+fr
+hu
+it
+ja
+ko
+nl
+pl
+pt_BR
+pt
+ru
+sv
+uk
+zh_CN
+zh_HK
+zh_TW
+EOF
+
%build
-autoreconf -v --install
-ln -s ../po config/po
-#%{__intltoolize}
-%{__glib_gettextize} --copy --force
-rm config/po
-sed -i -e 's/^mkinstalldirs.*/MKINSTALLDIRS=mkdir -p/' po/Makefile.in.in
+%{__glib_gettextize}
+%{__intltoolize} --automake
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+
+# bashisms inside
+sed -i -e 's@^#! /bin/sh$@#!/bin/bash@' configure
%configure \
- --disable-static
+ %{?with_beryl_mesa:--with-berylmesadir=beryl-mesa} \
+ --disable-static \
+ --enable-gconf
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- desktopfilesdir=%{_datadir}/wm-properties \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/beryl/backends/*.la
+
+# program removed
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/beryl-settings-dump.1
+
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS README TODO
+%attr(755,root,root) %{_bindir}/beryl
+%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/libini.so
%{_datadir}/beryl
-%{_mandir}/man1/*
+%{_mandir}/man1/beryl.1*
+%if %{with beryl_mesa}
+%attr(755,root,root) %{_bindir}/beryl-xgl
+%{_mandir}/man1/beryl-xgl.1*
+%endif
%files devel
%defattr(644,root,root,755)
-%dir %{_includedir}/beryl
-%{_includedir}/beryl/beryl.h
+%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