rpms/beryl-core/devel beryl-core.spec,1.1,1.2

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26893

Modified Files:
	beryl-core.spec 
Log Message:
- Don't Provides: beryl, instead create meta-packages
- Explicitly turn off use of libsvg-cairo
- Fix for hosed-up release tarball including .o files...

Users should be able to install everything via 'yum install beryl' or desktop environment specific stuff via 'yum install beryl-(gnome|kde)'. Well, once all the other bits are actually in the repo too...




Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/devel/beryl-core.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beryl-core.spec	14 Nov 2006 20:31:35 -0000	1.1
+++ beryl-core.spec	15 Nov 2006 15:22:26 -0000	1.2
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,8 +17,6 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-Provides:       beryl = %{name}-%{version}
-
 BuildRequires:  libX11-devel, libdrm-devel, libwnck-devel
 BuildRequires:  libXfixes-devel, libXrandr-devel, libXrender-devel
 BuildRequires:  libXcomposite-devel >= 0.3, libXdamage-devel, libXext-devel
@@ -47,15 +45,56 @@
 and library files for the beryl-core
 package.
 
+%package -n beryl
+Summary: Beryl meta-package to install all beryl components
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: beryl-gnome = %{version}-%{release}
+Requires: beryl-kde = %{version}-%{release}
+Requires: bdock >= %{version}
+
+%description -n beryl
+This is a meta-package, which depends on all available beryl bits,
+making it easy for users to get all things beryl installed.
+
+%package -n beryl-gnome
+Summary: Beryl meta-package to install all beryl components for Gnome
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
+Requires: beryl-plugins >= %{version}, beryl-dbus >= %{version}
+Requires: beryl-vidcap >= %{version}
+Requires: emerald >= %{version}, emerald-themes >= %{version}
+Requires: heliodor >= %{version}
+
+%description -n beryl-gnome
+This is a meta-package, which depends on all available beryl bits
+relevant to the Gnome desktop environment, making it easy for
+users to install all the beryl bits for Gnome.
+
+%package -n beryl-kde
+Summary: Beryl meta-package to install all beryl components for KDE
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: beryl-manager >= %{version}, beryl-settings >= %{version}
+Requires: beryl-plugins >= %{version}, beryl-vidcap >= %{version}
+Requires: emerald >= %{version}, emerald-themes >= %{version}
+Requires: aquamarine >= %{version}
+
+%description -n beryl-kde
+This is a meta-package, which depends on all available beryl bits
+relevant to the KDE desktop environment, making it easy for
+users to install all the beryl bits for KDE.
 
 %prep
 %setup -q
 %patch0 -p0 -b .mesa64
-#autoreconf -v --install
+# Somebody hosed up the release tarball...
+find mesa/src -name "*.o" | xargs rm -f
 
 
 %build
-%configure --enable-librsvg --enable-libsvg-cairo
+%configure
 ln -s %{_includedir}/X11 mesa/include/
 ln -s %{_includedir}/GL/glxproto.h mesa/include/GL/
 # Parallel builds currently broken
@@ -96,8 +135,21 @@
 %{_includedir}/beryl/*.h
 %{_mandir}/man3/beryl*
 
+%files -n beryl
+%defattr(-,root,root,-)
+
+%files -n beryl-gnome
+%defattr(-,root,root,-)
+
+%files -n beryl-kde
+%defattr(-,root,root,-)
 
 %changelog
+* Tue Nov 14 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-4
+- Don't Provides: beryl, instead create meta-packages
+- Minimize config flags, the build figures it out itself
+- Fix for hosed-up release tarball including .o files...
+
 * Tue Nov 14 2006 Jarod Wilson <jwilson at redhat.com> 0.1.2-3
 - Put man3 in -devel, remove dead libsvg-cairo-devel BR