From e10ba1e6d6f5cd5286994b5f7cbcd3f947986f06 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 5 Dec 2014 22:03:28 +0100 Subject: [PATCH] - updated to 0.1.26; build gtk2 variant too --- colord-gtk.spec | 85 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/colord-gtk.spec b/colord-gtk.spec index fd9998b..c968673 100644 --- a/colord-gtk.spec +++ b/colord-gtk.spec @@ -2,18 +2,19 @@ # Conditional build: %bcond_without apidocs # do not build and package API docs %bcond_without static_libs # don't build static libraries +%bcond_without gtk2 # additional GTK+ 2.x version of library %bcond_without vala # don't build Vala API # %define colord_ver 0.1.27 Summary: GTK helper library for colord Summary(pl.UTF-8): Biblioteka pomocniczna GTK dla colord Name: colord-gtk -Version: 0.1.25 -Release: 2 -License: GPL v2+ and LGPL v2+ -Group: Libraries +Version: 0.1.26 +Release: 1 +License: LGPL v2.1+ (library), GPL v2+ (cd-convert utility) +Group: X11/Libraries Source0: http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz -# Source0-md5: f3ad262c060fc50c10805b744be7479d +# Source0-md5: bb9d6f3c037152ad791003375aa6c16c URL: http://www.freedesktop.org/software/colord/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.9 @@ -21,6 +22,7 @@ BuildRequires: colord-devel >= %{colord_ver} BuildRequires: gettext-devel >= 0.17 BuildRequires: glib2-devel >= 1:2.28.0 BuildRequires: gobject-introspection-devel >= 0.9.8 +%{?with_gtk2:BuildRequires: gtk+2-devel >= 2.0} BuildRequires: gtk+3-devel >= 3.0 BuildRequires: gtk-doc >= 1.9 BuildRequires: intltool >= 0.40.0 @@ -33,6 +35,7 @@ BuildRequires: vala BuildRequires: vala-colord >= %{colord_ver} %endif Requires: colord-libs >= %{colord_ver} +Requires: glib2 >= 1:2.28.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -44,9 +47,10 @@ Biblioteka pomocniczna GTK dla colord. %package devel Summary: Header files for colord-gtk library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki colord-gtk -Group: Development/Libraries +Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Requires: colord-devel >= %{colord_ver} +Requires: glib2-devel >= 1:2.28.0 Requires: gtk+3-devel >= 3.0 %description devel @@ -58,7 +62,7 @@ Pliki nagłówkowe biblioteki colord-gtk. %package static Summary: Static colord-gtk library Summary(pl.UTF-8): Statyczna biblioteka colord-gtk -Group: Development/Libraries +Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static @@ -82,7 +86,7 @@ Dokumentacja API colord-gtk. %package -n vala-colord-gtk Summary: colord-gtk API for Vala language Summary(pl.UTF-8): API colord-gtk dla języka Vala -Group: Development/Libraries +Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: vala-colord >= %{colord_ver} @@ -92,6 +96,45 @@ colord-gtk API for Vala language. %description -n vala-colord-gtk -l pl.UTF-8 API colord-gtk dla języka Vala. +%package -n colord-gtk2 +Summary: GTK 2 helper library for colord +Summary(pl.UTF-8): Biblioteka pomocniczna GTK 2 dla colord +Group: X11/Libraries +Requires: colord-libs >= %{colord_ver} +Requires: glib2 >= 1:2.28.0 + +%description -n colord-gtk2 +GTK 2 helper library for colord. + +%description -n colord-gtk2 -l pl.UTF-8 +Biblioteka pomocniczna GTK 2 dla colord. + +%package -n colord-gtk2-devel +Summary: Development files for colord-gtk2 library +Summary(pl.UTF-8): Pliki programistyczne biblioteki colord-gtk2 +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: colord-gtk2 = %{version}-%{release} +Requires: gtk+2-devel >= 2.0 + +%description -n colord-gtk2-devel +Development files for colord-gtk2 library. + +%description -n colord-gtk2-devel -l pl.UTF-8 +Pliki programistyczne biblioteki colord-gtk2. + +%package -n colord-gtk2-static +Summary: Static colord-gtk2 library +Summary(pl.UTF-8): Statyczna biblioteka colord-gtk2 +Group: X11/Development/Libraries +Requires: colord-gtk2-devel = %{version}-%{release} + +%description -n colord-gtk2-static +Static colord-gtk2 library. + +%description -n colord-gtk2-static -l pl.UTF-8 +Statyczna biblioteka colord-gtk2. + %prep %setup -q @@ -105,6 +148,7 @@ API colord-gtk dla języka Vala. %configure \ --disable-silent-rules \ %{__enable_disable apidocs gtk-doc} \ + %{?with_gtk2:--enable-gtk2} \ %{__enable_disable static_libs static} \ %{?with_vala:--enable-vala} \ --with-html-dir=%{_gtkdocdir} @@ -120,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la -# only empty translation exists atm. (as of 0.1.25) +# only empty translation exists atm. (as of 0.1.26) #find_lang %{name} %clean @@ -129,13 +173,18 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post -n colord-gtk2 -p /sbin/ldconfig +%postun -n colord-gtk2 -p /sbin/ldconfig + %files # -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS MAINTAINERS NEWS README TODO +%attr(755,root,root) %{_bindir}/cd-convert %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 +%{_mandir}/man1/cd-convert.1* %files devel %defattr(644,root,root,755) @@ -162,3 +211,21 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_datadir}/vala/vapi/colord-gtk.vapi %endif + +%if %{with gtk2} +%files -n colord-gtk2 +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libcolord-gtk2.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libcolord-gtk2.so.1 + +%files -n colord-gtk2-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libcolord-gtk2.so +%{_pkgconfigdir}/colord-gtk2.pc + +%if %{with static_libs} +%files -n colord-gtk2-static +%defattr(644,root,root,755) +%{_libdir}/libcolord-gtk2.a +%endif +%endif -- 2.44.0