Author: qboosh Date: Sat Sep 18 08:20:42 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- separated -gobject* (GObject functions library) for better glib dependency
tracking
- separated -trace (cairo-trace debugging utility + preloadable library)
---- Files affected:
packages/cairo:
cairo.spec (1.111 -> 1.112)
---- Diffs:
================================================================
Index: packages/cairo/cairo.spec
diff -u packages/cairo/cairo.spec:1.111 packages/cairo/cairo.spec:1.112
--- packages/cairo/cairo.spec:1.111 Sat Sep 18 09:12:05 2010
+++ packages/cairo/cairo.spec Sat Sep 18 10:20:37 2010
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-# TODO: qt, drm/gallium, gl backends?
#
# Conditional build:
%bcond_without apidocs # disable gtk-doc
@@ -32,7 +31,7 @@
BuildRequires: libspectre-devel >= 0.2.0
BuildRequires: libtool >= 1.4
BuildRequires: pixman-devel >= 0.18.4
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.9
BuildRequires: poppler-glib-devel >= 0.13.3
BuildRequires: rpm >= 4.4.9-56
%if %{with xcb}
@@ -112,6 +111,56 @@
%description static -l pl.UTF-8
Statyczna biblioteka Cairo.
+%package gobject
+Summary: GObject functions library for Cairo graphics library
+Summary(pl.UTF-8): Biblioteka funkcji GObject dla biblioteki graficznej
Cairo
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gobject
+GObject functions library for Cairo graphics library.
+
+%description gobject -l pl.UTF-8
+Biblioteka funkcji GObject dla biblioteki graficznej Cairo.
+
+%package gobject-devel
+Summary: Header files for Cairo GObject library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Cairo GObject
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gobject = %{version}-%{release}
+Requires: glib2-devel >= 1:2.0
+
+%description gobject-devel
+Header files for Cairo GObject library.
+
+%description gobject-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki Cairo GObject.
+
+%package gobject-static
+Summary: Static Cairo GObject library
+Summary(pl.UTF-8): Statyczna biblioteka Cairo GObject
+Group: Development/Libraries
+Requires: %{name}-gobject-devel = %{version}-%{release}
+
+%description gobject-static
+Static Cairo GObject library.
+
+%description gobject-static -l pl.UTF-8
+Statyczna biblioteka Cairo GObject.
+
+%package trace
+Summary: Cairo calls tracing utility
+Summary(pl.UTF-8): Narzędzie do śledzenia wywołań Cairo
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+
+%description trace
+Cairo calls tracing utility.
+
+%description trace -l pl.UTF-8
+Narzędzie do śledzenia wywołań Cairo.
+
%package apidocs
Summary: Cairo API documentation
Summary(pl.UTF-8): Dokumentacja API Cairo
@@ -153,6 +202,9 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# LD_PRELOADable library
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/cairo/libcairo-trace.{la,a}
+
%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/cairo}
%clean
@@ -161,34 +213,29 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%post gobject -p /sbin/ldconfig
+%postun gobject -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
# COPYING contains only notes, not LGPL/MPL texts
%doc AUTHORS COPYING ChangeLog NEWS README
%attr(755,root,root) %{_libdir}/libcairo.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcairo.so.2
-%attr(755,root,root) %{_libdir}/libcairo-gobject.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcairo-gobject.so.2
%attr(755,root,root) %{_libdir}/libcairo-script-interpreter.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcairo-script-interpreter.so.2
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/cairo-trace
%attr(755,root,root) %{_libdir}/libcairo.so
-%attr(755,root,root) %{_libdir}/libcairo-gobject.so
%attr(755,root,root) %{_libdir}/libcairo-script-interpreter.so
-%dir %{_libdir}/cairo
-%attr(755,root,root) %{_libdir}/cairo/libcairo-trace.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/cairo/libcairo-trace.so.0
-%attr(755,root,root) %{_libdir}/cairo/libcairo-trace.so
%{_libdir}/libcairo.la
%{_libdir}/libcairo-script-interpreter.la
%{_includedir}/cairo
+%exclude %{_includedir}/cairo/cairo-gobject.h
%{_pkgconfigdir}/cairo.pc
%{_pkgconfigdir}/cairo-fc.pc
%{_pkgconfigdir}/cairo-ft.pc
-%{_pkgconfigdir}/cairo-gobject.pc
%{_pkgconfigdir}/cairo-pdf.pc
%{_pkgconfigdir}/cairo-png.pc
%{_pkgconfigdir}/cairo-ps.pc
@@ -201,10 +248,30 @@
%files static
%defattr(644,root,root,755)
%{_libdir}/libcairo.a
-%{_libdir}/libcairo-gobject.a
-%{_libdir}/libcairo-gobject.la
%{_libdir}/libcairo-script-interpreter.a
+%files gobject
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcairo-gobject.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcairo-gobject.so.2
+
+%files gobject-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcairo-gobject.so
+%{_libdir}/libcairo-gobject.la
+%{_includedir}/cairo/cairo-gobject.h
+%{_pkgconfigdir}/cairo-gobject.pc
+
+%files gobject-static
+%defattr(644,root,root,755)
+%{_libdir}/libcairo-gobject.a
+
+%files trace
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cairo-trace
+%dir %{_libdir}/cairo
+%attr(755,root,root) %{_libdir}/cairo/libcairo-trace.so*
+
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
@@ -217,6 +284,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.112 2010/09/18 08:20:37 qboosh
+- separated -gobject* (GObject functions library) for better glib dependency
tracking
+- separated -trace (cairo-trace debugging utility + preloadable library)
+
Revision 1.111 2010/09/18 07:12:05 qboosh
- updated BRs
- glitz backend is no more
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cairo/cairo.spec?r1=1.111&r2=1.112&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
