Author: qboosh Date: Mon May 21 17:01:15 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- gtk bcond for bootstrapping colord/gtk+3
- added gtk-static
- package bash-completion file for colormgr
---- Files affected:
packages/colord:
colord.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: packages/colord/colord.spec
diff -u packages/colord/colord.spec:1.21 packages/colord/colord.spec:1.22
--- packages/colord/colord.spec:1.21 Thu May 17 16:29:54 2012
+++ packages/colord/colord.spec Mon May 21 19:01:10 2012
@@ -4,6 +4,7 @@
%bcond_without apidocs # do not build and package API docs
%bcond_without static_libs # don't build static libraries
%bcond_without vala # don't build Vala API
+%bcond_without gtk # GTK+ support (disable for bootstrap)
#
Summary: Color daemon - system daemon for managing color devices
Summary(pl.UTF-8): Demon colord - usługa systemowa do zarządzania
urządzeniami obsługującymi kolory
@@ -21,7 +22,7 @@
BuildRequires: gettext-devel >= 0.17
BuildRequires: glib2-devel >= 1:2.28.0
BuildRequires: gobject-introspection-devel >= 0.9.8
-BuildRequires: gtk+3-devel
+%{?with_gtk:BuildRequires: gtk+3-devel >= 3.0}
BuildRequires: gtk-doc >= 1.9
BuildRequires: intltool >= 0.40.0
BuildRequires: lcms2-devel >= 2.2
@@ -90,6 +91,45 @@
%description static -l pl.UTF-8
Statyczna biblioteka colord.
+%package gtk
+Summary: GTK helper library for colord
+Summary(pl.UTF-8): Biblioteka pomocniczna GTK dla colord
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk+3 >= 3.0
+
+%description gtk
+GTK helper library for colord.
+
+%description gtk -l pl.UTF-8
+Biblioteka pomocnicza GTK dla colord.
+
+%package gtk-devel
+Summary: Header files for colord-gtk library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki colord-gtk
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-gtk = %{version}-%{release}
+Requires: gtk+3-devel >= 3.0
+
+%description gtk-devel
+Header files for colord-gtk library.
+
+%description gtk-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki colord-gtk.
+
+%package gtk-static
+Summary: Static colord-gtk library
+Summary(pl.UTF-8): Statyczna biblioteka colord-gtk
+Group: Development/Libraries
+Requires: %{name}-gtk-devel = %{version}-%{release}
+
+%description gtk-static
+Static colord-gtk library.
+
+%description gtk-static -l pl.UTF-8
+Statyczna biblioteka colord-gtk.
+
%package apidocs
Summary: colord API documentation
Summary(pl.UTF-8): Dokumentacja API colord
@@ -114,30 +154,17 @@
%description -n vala-colord -l pl.UTF-8
API colord dla języka Vala.
-%package gtk
-Summary: GTK helper library for colord
-Summary(pl.UTF-8): Biblioteka pomocniczna GTK dla colord
-Group: Libraries
-Suggests: %{name} = %{version}-%{release}
-
-%description gtk
-GTK helper library for colord.
-
-%description gtk -l pl.UTF-8
-Biblioteka pomocnicza GTK dla colord.
-
-%package gtk-devel
-Summary: Header files for colord-gtk library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki colord-gtk
-Group: Development/Libraries
-Requires: %{name}-gtk = %{version}-%{release}
-Requires: gtk+3-devel
+%package -n bash-completion-colord
+Summary: bash-completion for colormgr console commands
+Summary(pl.UTF-8): Bashowe uzupełnianie poleceń terminalowych colormgr
+Group: Applications/Shells
+Requires: bash-completion
-%description gtk-devel
-Header files for colord-gtk library.
+%description -n bash-completion-colord
+bash-completion for colormgr console commands.
-%description gtk-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki colord-gtk.
+%description -n bash-completion-colord -l pl.UTF-8
+Bashowe uzupełnianie poleceń terminalowych colormgr.
%prep
%setup -q
@@ -150,6 +177,7 @@
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_gtk:--disable-gtk} \
--disable-silent-rules \
%{__enable_disable apidocs gtk-doc} \
%{__enable_disable static_libs static} \
@@ -188,6 +216,9 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post gtk -p /sbin/ldconfig
+%postun gtk -p /sbin/ldconfig
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
@@ -241,8 +272,27 @@
%files static
%defattr(644,root,root,755)
%{_libdir}/libcolord.a
+%endif
+
+%if %{with gtk}
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcolord-gtk.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcolord-gtk.so.1
+%{_libdir}/girepository-1.0/ColordGtk-1.0.typelib
+
+%files gtk-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcolord-gtk.so
+%{_datadir}/gir-1.0/ColordGtk-1.0.gir
+%{_pkgconfigdir}/colord-gtk.pc
+
+%if %{with static_libs}
+%files gtk-static
+%defattr(644,root,root,755)
%{_libdir}/libcolord-gtk.a
%endif
+%endif
%if %{with apidocs}
%files apidocs
@@ -256,17 +306,9 @@
%{_datadir}/vala/vapi/colord.vapi
%endif
-%files gtk
+%files -n bash-completion-colord
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcolord-gtk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcolord-gtk.so.1
-%{_libdir}/girepository-1.0/ColordGtk-1.0.typelib
-
-%files gtk-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcolord-gtk.so
-%{_pkgconfigdir}/colord-gtk.pc
-%{_datadir}/gir-1.0/ColordGtk-1.0.gir
+%{_sysconfdir}/bash_completion.d/colormgr-completion.bash
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -274,6 +316,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.22 2012/05/21 17:01:10 qboosh
+- gtk bcond for bootstrapping colord/gtk+3
+- added gtk-static
+- package bash-completion file for colormgr
+
Revision 1.21 2012/05/17 14:29:54 kiesiu
- updated to 0.1.20
- added colord-gtk
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/colord/colord.spec?r1=1.21&r2=1.22
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
