rpms/brltty/F-12 .cvsignore, 1.7, 1.8 brltty-parallel.patch, 1.1, 1.2 brltty.spec, 1.35, 1.36 sources, 1.7, 1.8 brltty-3.9-autoconf.patch, 1.1, NONE brltty-gnusource.patch, 1.1, NONE

Wed Oct 28 17:26:39 UTC 2009

Author: kasal

Update of /cvs/extras/rpms/brltty/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2417/F-12

Modified Files:
	.cvsignore brltty-parallel.patch brltty.spec sources 
Removed Files:
	brltty-3.9-autoconf.patch brltty-gnusource.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8

--- .cvsignore	17 Sep 2008 15:59:49 -0000	1.7
+++ .cvsignore	28 Oct 2009 17:26:39 -0000	1.8
@@ -1 +1 @@
-brltty-3.10.tar.gz
+brltty-4.1.tar.gz

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

Index: brltty-parallel.patch
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/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	28 Oct 2009 17:26:39 -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/F-12/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	28 Oct 2009 17:26:39 -0000	1.36
@@ -1,5 +1,5 @@
-%define pkg_version 3.10
-%define api_version 0.5.2
+%define pkg_version 4.1
+%define api_version 0.5.4
 
 %{!?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,43 +9,44 @@
 
 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
+Patch6: brltty-autoconf-quote.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Summary: Braille display driver for Linux/Unix
-BuildRequires: byacc, glibc-kernheaders
-# BuildRequires: ocaml
+BuildRequires: byacc glibc-kernheaders
+BuildRequires: autoconf
+Requires: brlapi = %{api_version}-%{release}
 
 %description
 BRLTTY is a background process (daemon) which provides
 access to the Linux/Unix console (when in text mode)
 for a blind person using a refreshable braille display.
-It drives the braille display,
-and provides complete screen review functionality.
+It drives the braille display and provides complete
+screen review functionality.
 Some speech capability has also been incorporated.
 
 %package xw
-Requires: %{name}
 Summary: XWindow driver for BRLTTY
 Group: System Environment/Daemons
 License: GPLv2+
 BuildRequires: libSM-devel libICE-devel libX11-devel libXaw-devel libXext-devel libXt-devel libXtst-devel
+Requires: %{name} = %{pkg_version}-%{release}
 %description xw
 This package provides the XWindow driver for BRLTTY.
 
 %package at-spi
-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
+Requires: %{name} = %{pkg_version}-%{release}
 %description at-spi
 This package provides the AtSpi driver for BRLTTY.
 
@@ -116,35 +117,42 @@ 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
+%patch6 -p1 -b .quote
 
 %build
-./autogen
+# Patch6 changes aclocal.m4:
+autoconf
 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 \
+%configure CPPFLAGS="$java_inc" --disable-stripping --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)
-do
-   mkdir -p "doc/${file%/*}"
-   cp -rp "${file}" "doc/${file}"
+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 |
+while read file; do
+   mkdir -p doc/${file%/*} && cp -rp $file doc/$file || exit 1
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make INSTALL_PROGRAM='$(INSTALL_SCRIPT)' install #install-programs install-help install-tables install-drivers install-manpage
+make %{?_smp_mflags} install
+mv "$RPM_BUILD_ROOT%{_datadir}/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}"
-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
+
+# clean up the manuals:
+rm Documents/Manual-*/*/{*.mk,*.made,Makefile*}
 
 ls ${RPM_BUILD_ROOT}/%{_libdir}/brltty/*.so | \
     grep -v 'libbrlttybxw.so\|libbrlttyxas.so' | \
@@ -176,17 +184,18 @@ exit 0
 
 %files -f libs.filelist
 %defattr(-,root,root)
-%config(noreplace) /etc/brltty.conf
+%config(noreplace) %{_sysconfdir}/brltty.conf
 %{_bindir}/brltty
 %{_bindir}/brltty-*
 %{_bindir}/vstp
 %dir %{_libdir}/brltty
-/etc/brltty
-%doc COPYING
+%{_datadir}/brltty
+%doc LICENSE-GPL LICENSE-LGPL
 %doc Documents/ChangeLog Documents/TODO
-%doc Bootdisks/rhmkboot Bootdisks/rhmkroot
+%doc Documents/Manual-BRLTTY/
 %doc doc/*
-%doc /usr/share/man/man1/*
+%doc %{_mandir}/man[15]/brltty.*
+%doc %{_mandir}/man1/vstp.*
 
 %files xw
 %{_libdir}/brltty/libbrlttybxw.so
@@ -196,10 +205,11 @@ 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/Manual-BrlAPI/
+%doc Documents/README.Seika
+%doc %{_mandir}/man1/xbrlapi.*
 
 %files -n brlapi-devel
 %defattr(-,root,root)
@@ -207,7 +217,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 +236,24 @@ exit 0
 
 
 %changelog
+* Wed Oct 28 2009 Stepan Kasal <skasal at redhat.com> - 4.1-1
+- new upstream version
+- use --disable-stripping instead of make variable override
+- install the default brltty-pm.conf to docdir only (#526168)
+- remove the duplicate copies of rhmkboot and rhmkroot from docdir
+- patch configure so that the dirs in summary are not garbled:
+  brltty-autoconf-quote.patch
+
+* Tue Oct 20 2009 Stepan Kasal <skasal at redhat.com> - 4.0-2
+- escape rpm macros in the rpm change log
+- add requires to bind subpackages from one build together
+
+* Wed Oct  7 2009 Stepan Kasal <skasal at redhat.com> - 4.0-1
+- new upstream version
+- drop upstreamed patches; ./autogen not needed anymore
+- pack the xbrlapi server; move its man page to brlapi package
+- add man-page for brltty.conf (#526168)
+
 * 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
 
@@ -341,7 +369,7 @@ exit 0
 
 * Mon Jul 07 2003 Adrian Havill <havill at redhat.com> 3.2-2
 - changed spec "Copyright" to "License"
-- use %configure macro, %{_libdir} for non-ia32 archs
+- use %%configure macro, %%{_libdir} for non-ia32 archs
 - removed unnecessary set and unset, assumed/default spec headers
 - fixed unpackaged man page, duplicate /bin and /lib entries
 - use plain install vs scripts for non-i386 buildsys


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/brltty/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	17 Sep 2008 15:59:49 -0000	1.7
+++ sources	28 Oct 2009 17:26:39 -0000	1.8
@@ -1 +1 @@
-d52f332a29e00495d166e7f45403fa9d  brltty-3.10.tar.gz
+b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz


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


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


