From f3e0dcbb4e9f1734e0d1449003031dcdf6fa9eb8 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: May 30 2014 11:43:39 +0000
Subject: Update to 0.5.7, Build against libusbx and libftdi 1, Cleanup spec


---

diff --git a/.gitignore b/.gitignore
index 4439eeb..586a489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ lcdproc-0.5.2.tar.gz
 lcdproc-0.5.3.tar.gz
 /lcdproc-0.5.4.tar.gz
 /lcdproc-0.5.6.tar.gz
+/lcdproc-0.5.7.tar.gz
diff --git a/lcdproc-libftdi1.patch b/lcdproc-libftdi1.patch
new file mode 100644
index 0000000..2481103
--- /dev/null
+++ b/lcdproc-libftdi1.patch
@@ -0,0 +1,11 @@
+--- lcdproc-0.5.7/configure.ac.orig	2014-05-30 12:25:58.038476546 +0100
++++ lcdproc-0.5.7/configure.ac	2014-05-30 12:28:59.544408030 +0100
+@@ -314,7 +314,7 @@
+ 
+ if test "$enable_libftdi" = "yes"; then
+ 	ifdef([PKG_CHECK_MODULES],
+-	 	[PKG_CHECK_MODULES(LIBFTDI, libftdi >= 0.8,
++	 	[PKG_CHECK_MODULES(LIBFTDI, libftdi1 >= 1.0,
+ 			[AC_DEFINE(HAVE_LIBFTDI, [1], [Define to 1 if you have libftdi])],
+ 			[ enable_libftdi=no ])],
+ 		[AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libftdi may not be built])])
diff --git a/lcdproc.spec b/lcdproc.spec
index 20ca795..297a089 100644
--- a/lcdproc.spec
+++ b/lcdproc.spec
@@ -2,8 +2,8 @@
 
 Summary:        LCDproc displays real-time system information on a 20x4 backlit LCD
 Name:           lcdproc
-Version:        0.5.6
-Release:        6%{?dist}
+Version:        0.5.7
+Release:        1%{?dist}
 License:        GPLv2
 URL:            http://lcdproc.omnipotent.net
 Group:          System Environment/Libraries
@@ -11,7 +11,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Source1:        lcdproc.service
 Source2:        LCDd.service
 Patch0:         lcdproc-0.5.6-gcc47.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         lcdproc-libftdi1.patch
 
 BuildRequires:  systemd
 BuildRequires:  doxygen
@@ -21,7 +21,7 @@ BuildRequires:  freetype-devel
 %ifnarch s390 s390x
 BuildRequires:  libhid-devel
 %endif
-BuildRequires:  libusb-devel
+BuildRequires:  libusbx-devel
 BuildRequires:  lirc-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openldap-devel
@@ -34,6 +34,8 @@ BuildRequires:  libftdi-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
+# For libftdi1
+BuildRequires: libtool autoconf automake
 
 %{?systemd_requires}
 
@@ -53,6 +55,7 @@ See also http://lcdproc.omnipotent.net.
 %prep
 %setup -q
 %patch0 -p1 -b .gcc47
+%patch1 -p1 -b .ftdi
 chmod 644 server/drivers/timing.h
 
 sed -i -e 's|server/drivers|%{_libdir}/lcdproc|' LCDd.conf
@@ -60,6 +63,7 @@ touch -r TODO LCDd.conf
 
 
 %build
+autoreconf -vif
 %configure \
   --sysconfdir=%{_sysconfdir}/%{name} \
   --enable-libusb \
@@ -75,7 +79,7 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT __doc
+rm -rf __doc
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 make install-html-guides DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
@@ -113,11 +117,7 @@ done
 
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT __doc
-
 %files
-%defattr(-,root,root,-)
 %doc README* INSTALL COPYING CREDITS TODO ChangeLog
 %doc __doc/*
 %{_bindir}/*
@@ -133,6 +133,11 @@ rm -rf $RPM_BUILD_ROOT __doc
 
 
 %changelog
+* Fri May 30 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.5.7-1
+- Update to 0.5.7
+- Build against libusbx and libftdi 1
+- Cleanup spec
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 3d0b575..e9b3d6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df4f5c2c7285eaf6979b9c7768b4877f  lcdproc-0.5.6.tar.gz
+2f8e064233ef1d03e98c0b426595750d  lcdproc-0.5.7.tar.gz