[libconcord] update to 0.24, fixes ftbfs
Tom Callaway
spot at fedoraproject.org
Mon Aug 20 01:53:16 UTC 2012
commit f27d1e828f364fe61d7310b6ec138b820f6f3e09
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sun Aug 19 20:53:47 2012 -0500
update to 0.24, fixes ftbfs
.gitignore | 1 +
concordance-0.24-automake-1.12-fix.patch | 14 +++++
concordance-0.24-mime-type-def.patch | 88 ++++++++++++++++++++++++++++++
libconcord.spec | 25 +++------
sources | 2 +-
5 files changed, 111 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d271d83..47cbeba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
concordance-0.21.tar.bz2
/concordance-0.23.tar.bz2
+/concordance-0.24.tar.bz2
diff --git a/concordance-0.24-automake-1.12-fix.patch b/concordance-0.24-automake-1.12-fix.patch
new file mode 100644
index 0000000..52b7fe3
--- /dev/null
+++ b/concordance-0.24-automake-1.12-fix.patch
@@ -0,0 +1,14 @@
+diff -up concordance-0.24/libconcord/configure.ac.am112 concordance-0.24/libconcord/configure.ac
+--- concordance-0.24/libconcord/configure.ac.am112 2012-08-19 20:49:46.013033612 -0500
++++ concordance-0.24/libconcord/configure.ac 2012-08-19 20:50:05.485032735 -0500
+@@ -3,6 +3,10 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign]
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_LIBTOOL
+ AC_PROG_CXX
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
++
+ #
+ # allow the user to disable the mime database update
+ #
diff --git a/concordance-0.24-mime-type-def.patch b/concordance-0.24-mime-type-def.patch
new file mode 100644
index 0000000..959e98f
--- /dev/null
+++ b/concordance-0.24-mime-type-def.patch
@@ -0,0 +1,88 @@
+diff -up concordance-0.24/libconcord/config.h.in.mimetype concordance-0.24/libconcord/config.h.in
+--- concordance-0.24/libconcord/config.h.in.mimetype 2012-08-19 20:41:25.608051499 -0500
++++ concordance-0.24/libconcord/config.h.in 2012-08-19 20:43:28.285047224 -0500
+@@ -12,6 +12,9 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
++/* update mime database? */
++#undef HAVE_NEW_MIME
++
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+
+diff -up concordance-0.24/libconcord/configure.ac.mimetype concordance-0.24/libconcord/configure.ac
+--- concordance-0.24/libconcord/configure.ac.mimetype 2012-08-19 20:37:32.548058701 -0500
++++ concordance-0.24/libconcord/configure.ac 2012-08-19 20:38:37.485057666 -0500
+@@ -3,6 +3,23 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign]
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_LIBTOOL
+ AC_PROG_CXX
++#
++# allow the user to disable the mime database update
++#
++AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
++HAVE_NEW_MIME=no
++AC_ARG_ENABLE(mime-update,
++ AS_HELP_STRING([--disable-mime-update],
++ [Disable the MIME database update])],
++ [disable_mime=yes],
++ [disable_mime=no])
++if test "x$disable_mime" = "xno"; then
++ if test "x$UPDATE_MIME_DATABASE" != "xno"; then
++ HAVE_NEW_MIME=yes
++ AC_DEFINE(HAVE_NEW_MIME,1,[update mime database?])
++ fi
++fi
++AM_CONDITIONAL(HAVE_NEW_MIME, test x$HAVE_NEW_MIME = xyes)
+ a=1
+ AC_CHECK_HEADER(usb.h, [], [a=0])
+ AC_CHECK_LIB(usb, usb_init, [], [a=0])
+diff -up concordance-0.24/libconcord/libconcord.xml.mimetype concordance-0.24/libconcord/libconcord.xml
+--- concordance-0.24/libconcord/libconcord.xml.mimetype 2012-08-19 20:38:58.509056967 -0500
++++ concordance-0.24/libconcord/libconcord.xml 2012-08-19 20:39:18.187055958 -0500
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
++ <mime-type type="application/x-easyzapper-hex">
++ <comment>Logitech Harmony remote control update file (EZHex)</comment>
++ <glob pattern="*.EZHex"/>
++ </mime-type>
++ <mime-type type="application/x-easyzapper-upgrade">
++ <comment>Logitech Harmony remote control update file (EZUp)</comment>
++ <glob pattern="*.EZUp"/>
++ </mime-type>
++ <mime-type type="application/x-easyzapper-tutor">
++ <comment>Logitech Harmony remote control update file (EZTut)</comment>
++ <glob pattern="*.EZTut"/>
++ </mime-type>
++</mime-info>
+diff -up concordance-0.24/libconcord/Makefile.am.mimetype concordance-0.24/libconcord/Makefile.am
+--- concordance-0.24/libconcord/Makefile.am.mimetype 2012-08-19 20:39:32.562055701 -0500
++++ concordance-0.24/libconcord/Makefile.am 2012-08-19 20:41:16.969051809 -0500
+@@ -43,3 +43,25 @@ install_consolekit: consolekit install_u
+ $(install_sh_DATA) libconcord.perms \
+ $(DESTDIR)$(datarootdir)/hal/fdi/policy/10osvendor/99-libconcord.perms
+
++# MIME stuff
++
++newmimedir = $(datadir)/mime/packages
++newmime_DATA = libconcord.xml
++
++EXTRA_DIST = \
++ $(mime_DATA) \
++ $(newmime_DATA)
++
++install-data-hook:
++if HAVE_NEW_MIME
++ if test -z "$(DESTDIR)"; then \
++ $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \
++ fi
++endif
++
++uninstall-hook:
++if HAVE_NEW_MIME
++ if test -z "$(DESTDIR)"; then \
++ $(UPDATE_MIME_DATABASE) "$(datadir)/mime"; \
++ fi
++endif
diff --git a/libconcord.spec b/libconcord.spec
index 1bd7507..abd1029 100644
--- a/libconcord.spec
+++ b/libconcord.spec
@@ -2,24 +2,16 @@
%define mainpkg concordance
Name: libconcord
-Version: 0.23
-Release: 11%{?dist}
+Version: 0.24
+Release: 1%{?dist}
Summary: Library to talk to Logitech Harmony universal remote controls
Group: Development/Libraries
License: GPLv3+
URL: http://phildev.net/concordance/
Source0: http://downloads.sourceforge.net/sourceforge/concordance/%{mainpkg}-%{version}.tar.bz2
-Patch0: libconcord-0.23-mime-type-def.patch
-# Fix build with GCC 4.7 - include unistd.h in two places
-Patch1: libconcord-0.23-gcc47.patch
-# Add a 'modern udev' option to the rules generator, which hooks into
-# udev-acl support, and also update some long-deprecated key names
-Patch2: libconcord-0.23-modern_udev.patch
-# From upstream: fix the flash_base of the 525 (and 550), RHBZ #772517
-Patch3: libconcord-0.23-525_flash_base.patch
-# From upstream: name the 515, for prettiness' sake
-Patch4: libconcord-0.23-name_515.patch
+Patch0: concordance-0.24-mime-type-def.patch
+Patch1: concordance-0.24-automake-1.12-fix.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: libusb-devel
@@ -27,8 +19,6 @@ BuildRequires: swig
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
-
-# only so long as modern_udev.patch is downstream
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@@ -72,14 +62,10 @@ Python bindings for libconcord
%setup -q -n %{mainpkg}-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
cd %{name}
-# for modern_udev.patch
autoreconf -i
%configure --disable-static --disable-mime-update
@@ -186,6 +172,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Sun Aug 19 2012 Tom Callaway <spot at fedoraproject.org> - 0.24-1
+- update to 0.24
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index df00d87..4856677 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7400d5b351b195b63adfafae68be3d8 concordance-0.23.tar.bz2
+556f7b683fbe028d3d378e58889f3723 concordance-0.24.tar.bz2
More information about the scm-commits
mailing list