SPECS: beryl-core.spec - added link patch, deps cleanups, more ver...
qboosh
qboosh at pld-linux.org
Sun Dec 10 14:52:16 CET 2006
Author: qboosh Date: Sun Dec 10 13:52:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added link patch, deps cleanups, more verbose files
- -devel no longer conflicts with compiz-devel
---- Files affected:
SPECS:
beryl-core.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: SPECS/beryl-core.spec
diff -u SPECS/beryl-core.spec:1.17 SPECS/beryl-core.spec:1.18
--- SPECS/beryl-core.spec:1.17 Sun Dec 10 13:25:55 2006
+++ SPECS/beryl-core.spec Sun Dec 10 14:52:11 2006
@@ -1,9 +1,7 @@
# $Revision$, $Date$
#
-# TODO: python
-#
# Conditional build:
-%bcond_with beryl_mesa
+%bcond_with beryl_mesa # build beryl-xgl statically linked with own libGL
#
Summary: OpenGL window and compositing manager
Summary(pl): OpenGL-owy zarządca okien i składania
@@ -17,7 +15,10 @@
# Source0-md5: 24caed8a8cb50fd30823a9ee182f85f4
Source1: http://releases.beryl-project.org/%{version}/beryl-mesa-%{version}.tar.bz2
# Source1-md5: c22765c2637846907ee6154b548151e9
+Patch0: %{name}-link.patch
+URL: http://beryl-project.org/
BuildRequires: GConf2-devel >= 2.0
+BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1:1.9
BuildRequires: glib2-devel >= 2.0
@@ -25,7 +26,6 @@
BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: python-modules >= 1:2.2
BuildRequires: sed >= 4.0
BuildRequires: startup-notification-devel >= 0.7
BuildRequires: xorg-lib-libSM-devel
@@ -62,16 +62,18 @@
%package devel
Summary: Header files for beryl
Summary(pl): Pliki nagłówkowe dla beryla
-Group: Development/Libraries
+Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: OpenGL-devel
+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 >= 0.3
Requires: xorg-lib-libXdamage-devel
+Requires: xorg-lib-libXinerama-devel
Requires: xorg-lib-libXrandr-devel
-Conflicts: compiz-devel
+Requires: xorg-proto-glproto-devel
%description devel
Header files for beryl.
@@ -81,6 +83,8 @@
%prep
%setup -q %{?with_beryl_mesa: -a1}
+%patch0 -p1
+
mv -f po/{ca_ES,ca}.po
mv -f po/{es_ES,es}.po
mv -f po/{fr_FR,fr}.po
@@ -135,6 +139,11 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+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
@@ -145,23 +154,26 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
+%doc AUTHORS README TODO
+%attr(755,root,root) %{_bindir}/beryl
+%attr(755,root,root) %{_libdir}/libberylsettings.so.*.*.*
%dir %{_libdir}/beryl
%dir %{_libdir}/beryl/backends
%attr(755,root,root) %{_libdir}/beryl/backends/*.so
-# XXX: check if needed (I don't see libltdl in BRs)
-%{_libdir}/beryl/backends/*.la
%{_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)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libberylsettings.so
+%{_libdir}/libberylsettings.la
%{_includedir}/beryl
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/beryl.pc
+%{_pkgconfigdir}/berylsettings.pc
%{_mandir}/man3/*.3*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -170,6 +182,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2006/12/10 13:52:11 qboosh
+- added link patch, deps cleanups, more verbose files
+- -devel no longer conflicts with compiz-devel
+
Revision 1.17 2006/12/10 12:25:55 qboosh
- locale fixes, updated some BRs
- individual tool invocations instead of autoreconf (which omits force)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/beryl-core.spec?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list