- unconditional noarch subpackages

[packages/colorhug-client.git] / colorhug-client.spec

diff --git a/colorhug-client.spec b/colorhug-client.spec
index 281988b015947c8dacb3b4202a0f32ee4446c786..9f7ba8f01e89bf1a8fbaa877a04d671dce22e678 100644 (file)
--- a/colorhug-client.spec
+++ b/colorhug-client.spec
@@ -1,32 +1,34 @@
 Summary:       Tools for the Hughski Colorimeter
 Summary(pl.UTF-8):     Narzędzia do kolorymetrów Hughski
 Name:          colorhug-client
-Version:       0.2.2
+Version:       0.2.8
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: cc3a1885c1618cc991c9de7e2849bd4d
+# Source0-md5: 7c73d5088e14556f09181115346448ac
+Patch0:                %{name}-bashcomp.patch
 URL:           http://hughski.com/
-BuildRequires: colord-devel >= 1.2.3
+BuildRequires: colord-devel >= 1.2.9
 BuildRequires: colord-gtk-devel >= 0.1.24
 BuildRequires: docbook-utils
-BuildRequires: gettext-devel >= 0.17
+BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.31.10
 BuildRequires: gobject-introspection-devel >= 0.9.8
 BuildRequires: gtk+3-devel >= 3.11.2
 BuildRequires: intltool >= 0.50.0
 BuildRequires: lcms2-devel
 BuildRequires: libcanberra-gtk3-devel >= 0.10
-BuildRequires: libgusb-devel >= 0.1.4
+BuildRequires: libgusb-devel >= 0.2.2
 BuildRequires: libsoup-devel >= 2.4
 BuildRequires: pkgconfig
 BuildRequires: sqlite3-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      colord-libs >= 1.2.3
+BuildRequires: yelp-tools
+Requires:      colord-libs >= 1.2.9
 Requires:      glib2 >= 1:2.31.10
-Requires:      libgusb >= 0.1.4
+Requires:      libgusb >= 0.2.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # why programs are installed to libexecdir in the first place?
@@ -74,10 +76,8 @@ sensorem.
 Summary:       Bash completion support for ColorHug console commands
 Summary(pl.UTF-8):     Bashowe uzupełnianie składni dla poleceń terminalowych ColorHuga
 Group:         Applications/Shells
-Requires:      bash-completion
-%if "%{_rpmversion}" >= "5"
+Requires:      bash-completion >= 2.0
 BuildArch:     noarch
-%endif
 
 %description -n bash-completion-colorhug
 Bash completion support for ColorHug console commands.
@@ -87,6 +87,7 @@ Bashowe uzupełnianie składni dla poleceń terminalowych ColorHuga.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal} -I m4
@@ -94,6 +95,7 @@ Bashowe uzupełnianie składni dla poleceń terminalowych ColorHuga.
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-bash-completion=%{bash_compdir} \
        --disable-silent-rules
 %{__make}
 
@@ -103,9 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# remove empty de locale
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/de
 mv $RPM_BUILD_ROOT%{_localedir}/{cs_CZ,cs}
+# replace de with more complete version from de_DE
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/de
 mv $RPM_BUILD_ROOT%{_localedir}/{de_DE,de}
 mv $RPM_BUILD_ROOT%{_localedir}/{el_GR,el}
 mv $RPM_BUILD_ROOT%{_localedir}/{es_ES,es}
@@ -117,8 +119,6 @@ mv $RPM_BUILD_ROOT%{_localedir}/{nl_NL,nl}
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pl_PL
 # just a copy of pt (only header differs)
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pt_PT
-# program not packaged (unfinished as of 0.2.2)
-%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/colorhug-spectro-util.desktop
 
 %find_lang %{name}
 
@@ -130,29 +130,36 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/colorhug
 %attr(755,root,root) %{_bindir}/colorhug-cmd
-%attr(755,root,root) %{_bindir}/colorhug-inhx32-to-bin
 %{_datadir}/glib-2.0/schemas/com.hughski.colorhug-client.gschema.xml
 %{_mandir}/man1/colorhug-cmd.1*
 
 %files gui
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/colorhug-backlight
 %attr(755,root,root) %{_bindir}/colorhug-ccmx
 %attr(755,root,root) %{_bindir}/colorhug-flash
+%attr(755,root,root) %{_bindir}/colorhug-refresh
 %{_datadir}/colorhug-client
-%{_datadir}/appdata/colorhug-ccmx.appdata.xml
-%{_datadir}/appdata/colorhug-flash.appdata.xml
+%{_datadir}/appdata/com.hughski.ColorHug.Backlight.appdata.xml
+%{_datadir}/appdata/com.hughski.ColorHug.CcmxLoader.appdata.xml
+%{_datadir}/appdata/com.hughski.ColorHug.DisplayAnalysis.appdata.xml
+%{_datadir}/appdata/com.hughski.ColorHug.FlashLoader.appdata.xml
 %{_datadir}/help/C/colorhug-client
-%{_desktopdir}/colorhug-ccmx.desktop
 %{_desktopdir}/colorhug-docs.desktop
-%{_desktopdir}/colorhug-flash.desktop
+%{_desktopdir}/com.hughski.ColorHug.Backlight.desktop
+%{_desktopdir}/com.hughski.ColorHug.CcmxLoader.desktop
+%{_desktopdir}/com.hughski.ColorHug.DisplayAnalysis.desktop
+%{_desktopdir}/com.hughski.ColorHug.FlashLoader.desktop
 %{_iconsdir}/hicolor/*/apps/colorhug*.png
 %{_iconsdir}/hicolor/*/apps/colorimeter-colorhug-inactive.png
 %{_iconsdir}/hicolor/scalable/apps/colorhug.svg
 %{_iconsdir}/hicolor/*x*/mimetypes/application-x-ccmx.png*
 %{_iconsdir}/hicolor/scalable/mimetypes/application-x-ccmx.svg
-%{_mandir}/man1/colorhug-flash.1*
+%{_mandir}/man1/colorhug-backlight.1*
 %{_mandir}/man1/colorhug-ccmx.1*
+%{_mandir}/man1/colorhug-flash.1*
+%{_mandir}/man1/colorhug-refresh.1*
 
 %files -n bash-completion-colorhug
 %defattr(644,root,root,755)
-/etc/bash_completion.d/colorhug-cmd-completion.bash
+%{bash_compdir}/colorhug-cmd