rpms/brltty/devel brltty-4.2-S_ISCHR.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 brltty.spec, 1.41, 1.42 sources, 1.9, 1.10

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/brltty/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17250

Modified Files:
	.cvsignore brltty.spec sources 
Added Files:
	brltty-4.2-S_ISCHR.patch 
Log Message:
update to 4.2, drop static lib

brltty-4.2-S_ISCHR.patch:
 sys_linux.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE brltty-4.2-S_ISCHR.patch ---
diff -up brltty-4.2/Programs/sys_linux.c.BAD brltty-4.2/Programs/sys_linux.c
--- brltty-4.2/Programs/sys_linux.c.BAD	2010-05-21 09:04:10.003122084 -0400
+++ brltty-4.2/Programs/sys_linux.c	2010-05-21 09:04:19.376198268 -0400
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <linux/kd.h>
 
 #ifdef HAVE_LINUX_INPUT_H


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/brltty/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Oct 2009 17:26:39 -0000	1.9
+++ .cvsignore	21 May 2010 13:17:14 -0000	1.10
@@ -1 +1 @@
-brltty-4.1.tar.gz
+brltty-4.2.tar.gz


Index: brltty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- brltty.spec	20 Jan 2010 17:43:07 -0000	1.41
+++ brltty.spec	21 May 2010 13:17:15 -0000	1.42
@@ -1,5 +1,5 @@
-%define pkg_version 4.1
-%define api_version 0.5.4
+%define pkg_version 4.2
+%define api_version 0.5.5
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %define pyver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v")}
@@ -15,14 +15,14 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
 Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
-Patch4: brltty-cppflags.patch
-Patch5: brltty-parallel.patch
-Patch6: brltty-autoconf-quote.patch
+Patch0: brltty-cppflags.patch
+Patch1: brltty-autoconf-quote.patch
+Patch2: brltty-4.2-S_ISCHR.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Summary: Braille display driver for Linux/Unix
 BuildRequires: byacc glibc-kernheaders
@@ -137,9 +137,9 @@ This package provides the Java binding f
 
 %prep
 %setup -q
-%patch4 -p1 -b .cppflags
-%patch5 -p1 -b .parallel
-%patch6 -p1 -b .quote
+%patch0 -p1 -b .cppflags
+%patch1 -p1 -b .quote
+%patch2 -p1 -b .S_ISCHR
 
 %build
 # Patch6 changes aclocal.m4:
@@ -168,11 +168,8 @@ done
 rm -rf $RPM_BUILD_ROOT
 # does not seem to be parallel safe
 make install
-mv "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.a" "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/"
 rm "$RPM_BUILD_ROOT%{_libdir}/libbrlapi.so"
 ln -s ../../%{_lib}/libbrlapi.so "$RPM_BUILD_ROOT%{_prefix}/%{_lib}/"
-mv "$RPM_BUILD_ROOT%{_sysconfdir}/brltty/brltty-pm.conf" \
-  doc/Drivers/Braille/Papenmeier/
 install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
 echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
@@ -181,6 +178,9 @@ echo ".so man1/brltty.1" > $RPM_BUILD_RO
 rm Documents/Manual-*/*/{*.mk,*.made,Makefile*}
 mv Documents/BrlAPIref/{html,BrlAPIref}
 
+# Don't want static lib
+rm -rf $RPM_BUILD_ROOT/%{_lib}/libbrlapi.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -253,7 +253,6 @@ exit 0
 
 %files -n brlapi-devel
 %defattr(-,root,root)
-%{_prefix}/%{_lib}/libbrlapi.a
 %{_prefix}/%{_lib}/libbrlapi.so
 %{_includedir}/brltty
 %{_includedir}/brlapi*.h
@@ -276,6 +275,11 @@ exit 0
 
 
 %changelog
+* Fri May 21 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 4.2-1
+- update to 4.2
+- drop static lib (bz 556041)
+- fix undefined S_ISCHR call
+
 * Wed Jan 20 2010 Stepan Kasal <skasal at redhat.com> - 4.1-5
 - requires(post): coreutils to work around an installator bug
 - Resolves: #540437


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/brltty/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	28 Oct 2009 17:26:39 -0000	1.9
+++ sources	21 May 2010 13:17:15 -0000	1.10
@@ -1 +1 @@
-b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz
+192af5e634210616928496645e392097  brltty-4.2.tar.gz