rpms/brltty/devel brltty-parallel.patch, 1.1, 1.2 brltty.spec, 1.35, 1.36 brltty-3.9-autoconf.patch, 1.1, NONE brltty-gnusource.patch, 1.1, NONE

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/brltty/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3672

Modified Files:
	brltty-parallel.patch brltty.spec 
Removed Files:
	brltty-3.9-autoconf.patch brltty-gnusource.patch 
Log Message:
- new upstream version
- drop upstreamed patches; ./autogen nut needed anymore
- pack the xbrlapi server; move its man page to brlapi package

brltty-parallel.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: brltty-parallel.patch
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- brltty-parallel.patch	17 Sep 2008 15:40:27 -0000	1.1
+++ brltty-parallel.patch	9 Oct 2009 11:48:43 -0000	1.2
@@ -5,16 +5,14 @@
 	"make brlapi" when parallel make is used.  Recursive make is
 	harmful.
 
-diff -up brltty-3.10/Makefile.in.parallel brltty-3.10/Makefile.in
-diff -up brltty-3.10/Programs/Makefile.in.parallel brltty-3.10/Programs/Makefile.in
---- brltty-3.10/Programs/Makefile.in.parallel	2008-07-17 00:19:08.000000000 +0200
-+++ brltty-3.10/Programs/Makefile.in	2008-09-17 11:24:35.000000000 +0200
-@@ -399,7 +399,7 @@ apitest.$O:
+--- brltty-4.0/Programs/Makefile.in.parallel	2009-10-07 20:48:57.000000000 +0200
++++ brltty-4.0/Programs/Makefile.in	2009-10-07 20:50:03.000000000 +0200
+@@ -428,7 +428,7 @@
  
  ###############################################################################
  
--braille-drivers: txt2hlp
-+braille-drivers: txt2hlp api
+-braille-drivers: txt2hlp$X
++braille-drivers: txt2hlp$X api
  	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
  	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-all) || exit 1; \
  	done


Index: brltty.spec
===================================================================
RCS file: /cvs/extras/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- brltty.spec	24 Jul 2009 18:25:41 -0000	1.35
+++ brltty.spec	9 Oct 2009 11:48:43 -0000	1.36
@@ -1,5 +1,5 @@
-%define pkg_version 3.10
-%define api_version 0.5.2
+%define pkg_version 4.0
+%define api_version 0.5.3
 
 %{!?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")}
@@ -9,13 +9,11 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 6%{?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
-Patch2: brltty-gnusource.patch
-Patch3: brltty-3.9-autoconf.patch
 Patch4: brltty-cppflags.patch
 Patch5: brltty-parallel.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -44,7 +42,8 @@ This package provides the XWindow driver
 Requires: %{name}
 Summary: AtSpi driver for BRLTTY
 Group: System Environment/Daemons
-License: GPLv2+
+# The data files are licensed under LGPLv2+, see the README file.
+License: GPLv2+ and LGPLv2+
 BuildRequires: at-spi-devel
 %description at-spi
 This package provides the AtSpi driver for BRLTTY.
@@ -116,22 +115,18 @@ This package provides the Java binding f
 
 %prep
 %setup -q
-%patch2 -p1 -b .gnusource
-%patch3 -p1 -b .autoconf
 %patch4 -p1 -b .cppflags
 %patch5 -p1 -b .parallel
 
 %build
-./autogen
 for i in -I/usr/lib/jvm/java/include{,/linux}; do
       java_inc="$java_inc $i"
 done
 # there is no curses packages in BuildRequires, so the package builds
 # without them in mock; let's express this decision explicitly
 %configure CPPFLAGS="$java_inc" --without-curses \
+  --with-data-directory='${datadir}/${PACKAGE_NAME}' \
   --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt
-cat config.log
-#exit 1
 make %{?_smp_mflags}
 
 for file in $(find . \( -path ./doc -o -path ./Documents \) -prune -o \( -name 'README*' -o -name '*.txt' -o -name '*.html' -o -name '*.sgml' -o -name \*.patch -o \( -path "./Bootdisks/*" -type f -perm +ugo=x \) \) -print)
@@ -143,8 +138,9 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_PROGRAM='$(INSTALL_SCRIPT)' install #install-programs install-help install-tables install-drivers install-manpage
+install -d -m 755 "${RPM_BUILD_ROOT}%{_sysconfdir}" "$RPM_BUILD_ROOT%{_mandir}/man5"
 install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}"
-rm -f ${RPM_BUILD_ROOT}/usr/bin/xbrlapi # whatever this is, we exclude it for now
+echo ".so man1/brltty.1" > $RPM_BUILD_ROOT%{_mandir}/man5/brltty.conf.5
 
 ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \
     grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \
@@ -181,12 +177,14 @@ exit 0
 %{_bindir}/brltty-*
 %{_bindir}/vstp
 %dir %{_libdir}/brltty
-/etc/brltty
-%doc COPYING
+%{_datadir}/brltty
+%doc LICENSE-GPL LICENSE-LGPL
 %doc Documents/ChangeLog Documents/TODO
+%doc Documents/Manual-BRLTTY
 %doc Bootdisks/rhmkboot Bootdisks/rhmkroot
 %doc doc/*
-%doc /usr/share/man/man1/*
+%doc %{_mandir}/man[15]/brltty.*
+%doc %{_mandir}/man1/vstp.*
 
 %files xw
 %{_libdir}/brltty/libbrlttybxw.so
@@ -196,10 +194,12 @@ exit 0
 
 %files -n brlapi
 %defattr(-,root,root)
+%{_bindir}/xbrlapi
 %{_libdir}/libbrlapi.so.*
 %doc Documents/Manual-BrlAPI/English/BrlAPI.sgml Documents/Manual-BrlAPI/English/BrlAPI.txt
 %doc Documents/Manual-BrlAPI/English/BrlAPI*.html
-%doc Documents/README.Gnopernicus
+%doc Documents/README.Seika
+%doc %{_mandir}/man1/xbrlapi.*
 
 %files -n brlapi-devel
 %defattr(-,root,root)
@@ -207,7 +207,7 @@ exit 0
 %{_libdir}/libbrlapi.so
 %{_includedir}/brltty
 %{_includedir}/brlapi*.h
-%doc %{_mandir}/man3/*
+%doc %{_mandir}/man3/brlapi_*.3*
 %doc Documents/BrlAPIref/html
 
 %files -n tcl-brlapi
@@ -226,6 +226,11 @@ exit 0
 
 
 %changelog
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-1
+- new upstream version
+- drop upstreamed patches; ./autogen nut needed anymore
+- pack the xbrlapi server; move its man page to brlapi package
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- brltty-3.9-autoconf.patch DELETED ---


--- brltty-gnusource.patch DELETED ---