- updated to 0.2.5

- added bashcomp patch (don't require bash-completions at build time)

diff --git a/colorhug-client-bashcomp.patch b/colorhug-client-bashcomp.patch
new file mode 100644 (file)
index 0000000..464ceb0
--- /dev/null
+++ b/colorhug-client-bashcomp.patch
@@ -0,0 +1,20 @@
+--- colorhug-client-0.2.5/configure.ac.orig    2014-12-15 22:12:13.000000000 +0100
++++ colorhug-client-0.2.5/configure.ac 2014-12-24 22:11:23.833755795 +0100
+@@ -141,11 +141,15 @@
+ AC_ARG_ENABLE(bash_completion, AS_HELP_STRING([--enable-bash-completion],[Enable bash completion]),
+             enable_bash_completion=$enableval, enable_bash_completion=yes)
+ if test x$enable_bash_completion != xno; then
++      if test x$enable_bash_completion != xyes; then
++              BASH_COMPLETIONS_DIR=$enable_bash_completion
++      else
+       PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0])
+       BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
+-      AC_SUBST([BASH_COMPLETIONS_DIR])
++      fi
+ fi
+-AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$enable_bash_completion" = "xyes"])
++AC_SUBST([BASH_COMPLETIONS_DIR])
++AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$enable_bash_completion" != "xno"])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Build windows release build (no debugging window)

diff --git a/colorhug-client.spec b/colorhug-client.spec
index bfa677d0f895de6bd208c4a6a2ed0b2a9ef514f1..af85db7cef03347e44ab7efa8ba70533b24493fc 100644 (file)
--- a/colorhug-client.spec
+++ b/colorhug-client.spec
@@ -1,12 +1,13 @@
 Summary:       Tools for the Hughski Colorimeter
 Summary(pl.UTF-8):     Narzędzia do kolorymetrów Hughski
 Name:          colorhug-client
-Version:       0.2.4
+Version:       0.2.5
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 9c1d91b3516562abb8a23520b2b41eb8
+# Source0-md5: 586f18b7c1f3c1e24919f31548207879
+Patch0:                %{name}-bashcomp.patch
 URL:           http://hughski.com/
 BuildRequires: colord-devel >= 1.2.4
 BuildRequires: colord-gtk-devel >= 0.1.24
@@ -74,7 +75,7 @@ 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
+Requires:      bash-completion >= 2.0
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -87,6 +88,7 @@ Bashowe uzupełnianie składni dla poleceń terminalowych ColorHuga.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal} -I m4
@@ -94,6 +96,7 @@ Bashowe uzupełnianie składni dla poleceń terminalowych ColorHuga.
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-bash-completion=%{bash_compdir} \
        --disable-silent-rules
 %{__make}
 
@@ -138,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/colorhug-refresh
 %{_datadir}/colorhug-client
 %{_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-docs.desktop
@@ -149,9 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_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-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