rpms/orca
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f15'

Browse Source 
Conflicts:
	orca.spec
This commit is contained in:
Tomas Bzatek 2011-04-22 14:14:12 +02:00
commit 15d85dfec4
9 changed files with 93 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -8,3 +8,8 @@ orca-2.31.6.tar.bz2
/orca-2.91.3.tar.bz2
/orca-2.91.5.tar.bz2
/orca-2.91.6.tar.bz2
/orca-2.91.90.tar.bz2
/orca-2.91.91.tar.bz2
/orca-2.91.92.tar.bz2
/orca-2.91.93.tar.bz2
/orca-3.0.0.tar.bz2

19
no-display.patch
View File

@ -1,19 +0,0 @@
diff -up orca-2.23.90/configure.in.no-display orca-2.23.90/configure.in
--- orca-2.23.90/configure.in.no-display 2008-08-23 11:35:26.000000000 -0400
+++ orca-2.23.90/configure.in 2008-08-23 11:35:39.000000000 -0400
@@ -101,7 +101,6 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(C
AM_CHECK_PYMOD(gettext,,,[AC_MSG_ERROR(Could not find python module gettext)])
AM_CHECK_PYMOD(getopt,,,[AC_MSG_ERROR(Could not find python module getopt)])
-AM_CHECK_PYMOD(wnck,,,[AC_MSG_ERROR(Could not find python module wnck)])
AM_CHECK_PYMOD(bonobo,,,[AC_MSG_ERROR(Could not find python module bonobo - make sure you have gnome-python with support for libbonobo-2.0 >= 2.14.0 installed)])
AM_CHECK_PYMOD(ORBit,,,[AC_MSG_ERROR(Could not find python module ORBit - make sure you have pyorbit >= 2.14.0 installed)])
AM_CHECK_PYMOD(ORBit,CORBA,,[AC_MSG_ERROR(Could not find python module ORBit.CORBA - make sure you have pyorbit >= 2.14.0 installed)])
@@ -109,6 +108,7 @@ AM_CHECK_PYMOD(ORBit,CORBA,,[AC_MSG_ERRO
# Don't require the DISPLAY to be set - the gtk checking will fail
# if DISPLAY is not set, and we don't like that.
#
+#AM_CHECK_PYMOD(wnck,,,[AC_MSG_ERROR(Could not find python module wnck)])
#AM_CHECK_PYMOD(gconf,,,[AC_MSG_ERROR(Could not find python module gconf - make sure you have pygtk >= 2.8.14 installed)])
#AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find python module gtk - make sure you have pygtk >= 2.8.14 installed)])
#AM_CHECK_PYMOD(gtk,gdk,,[AC_MSG_ERROR(Could not find python module gtk.gdk - make sure you have pygtk >= 2.8.14 installed)])

43
orca-1.0.0-add-stop-switch.patch
View File

@ -1,43 +0,0 @@
--- orca-1.0.0/src/orca/orca.py.add-stop-switch 2006-08-27 19:29:38.000000000 -0400
+++ orca-1.0.0/src/orca/orca.py 2006-09-19 22:12:47.000000000 -0400
@@ -1160,7 +1160,10 @@
"gui-setup",
"text-setup",
"no-setup",
- "version"])
+ "version",
+ "stop"])
+
+ do_shutdown = False
for opt, val in opts:
if opt in ("-s", "--gui-setup", "--setup"):
setupRequested = True
@@ -1176,6 +1179,9 @@
if opt in ("-v", "--version"):
print "Orca %s" % platform.version
os._exit(0)
+ if opt in ("--stop"):
+ do_shutdown = True
+ bypassSetup = True
except:
usage()
os._exit(2)
@@ -1185,7 +1191,7 @@
import commands
a11yEnabled = commands.getoutput(\
"gconftool-2 --get /desktop/gnome/interface/accessibility")
- if a11yEnabled != "true":
+ if a11yEnabled != "true" and not do_shutdown:
_showPreferencesConsole()
abort()
@@ -1205,6 +1211,9 @@
registry = atspi.Registry()
init(registry)
+ if do_shutdown:
+ shutdown()
+
# Check to see if the user wants the configuration GUI. It's
# done here so that the user's existing preferences can be used
# to set the initial GUI state. We'll also force the set to

43
orca-2.17.4-add-stop-switch.patch
View File

@ -1,43 +0,0 @@
--- orca-2.17.4/src/orca/orca.py.add-stop-switch 2006-12-12 20:21:31.000000000 -0500
+++ orca-2.17.4/src/orca/orca.py 2006-12-20 01:12:04.000000000 -0500
@@ -1297,7 +1297,10 @@
"gui-setup",
"text-setup",
"no-setup",
- "version"])
+ "version",
+ "stop"])
+
+ do_shutdown = False
for opt, val in opts:
if opt in ("-u", "--user-prefs-dir"):
userPrefsDir = val.strip();
@@ -1353,6 +1356,9 @@
if opt in ("-v", "--version"):
print "Orca %s" % platform.version
os._exit(0)
+ if opt in ("--stop"):
+ do_shutdown = True
+ bypassSetup = True
except:
debug.printException(debug.LEVEL_OFF)
usage()
@@ -1368,7 +1374,7 @@
import commands
a11yEnabled = commands.getoutput(\
"gconftool-2 --get /desktop/gnome/interface/accessibility")
- if (not bypassSetup) and (a11yEnabled != "true"):
+ if (not bypassSetup) and (a11yEnabled != "true" and not do_shutdown):
_showPreferencesConsole()
abort()
@@ -1388,6 +1394,9 @@
registry = atspi.Registry()
init(registry)
+ if do_shutdown:
+ shutdown()
+
# Check to see if the user wants the configuration GUI. It's
# done here so that the user's existing preferences can be used
# to set the initial GUI state. We'll also force the set to

20
orca-fix-signal-handling.patch
View File

@ -1,20 +0,0 @@
Index: orca/src/orca/orca.in
===================================================================
--- orca/src/orca/orca.in (revision 3817)
+++ orca/src/orca/orca.in (working copy)
@@ -272,9 +272,13 @@ else
#
if [ `egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
then
- runOrca "NO_CLEANUP"
+ runOrca "NO_CLEANUP" &
+ orca_pid=$!
+ wait $orca_pid
else
- runOrca
+ runOrca &
+ orca_pid=$!
+ wait $orca_pid
fi
fi
fi

8
orca-not-for-kde.patch Normal file
View File

@ -0,0 +1,8 @@
diff -up orca-3.0.0/orca-autostart.desktop.in.no-orca-for-kde orca-3.0.0/orca-autostart.desktop.in
--- orca-3.0.0/orca-autostart.desktop.in.no-orca-for-kde 2011-04-07 18:31:54.754435205 -0400
+++ orca-3.0.0/orca-autostart.desktop.in 2011-04-07 18:32:09.448251503 -0400
@@ -6,3 +6,4 @@ NoDisplay=true
AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled
X-GNOME-AutoRestart=true
#X-GNOME-Autostart-Phase=Initialization
+OnlyShowIn=GNOME;

111
orca.spec
View File

@ -6,34 +6,32 @@
%define pyorbit_version 2.0.1
%define pygtk2_version 2.6.2
%define gnome_python_version 2.6.2
%define gnome_python_version 2.6.2
%define brltty_version 3.7.2
%define gnome_speech_version 0.3.10
%define libspi_version 1.7.6
%define brlapi_version 0.4.1
%define brltty_version 3.7.2
%define control_center_version 2.16.0-5
Name: orca
Version: 2.91.6
Release: 3%{?dist}
Summary: Assistive technology for people with visual impairments
Name: orca
Version: 3.0.0
Release: 2%{?dist}
Summary: Assistive technology for people with visual impairments
Group: User Interface/Desktops
License: LGPLv2+
URL: http://projects.gnome.org/orca/
Group: User Interface/Desktops
License: LGPLv2+
URL: http://projects.gnome.org/orca/
#VCS: git:git://git.gnome.org/orca
Source0: http://download.gnome.org/sources/orca/2.91/orca-%{version}.tar.bz2
BuildRequires: python-devel >= %{python_version}
BuildRequires: brlapi-devel >= %{brlapi_version}
BuildRequires: brltty >= %{brltty_version}
BuildRequires: pyorbit-devel >= %{pyorbit_version}
BuildRequires: pygtk2-devel >= %{pygtk2_version}
Source0: http://download.gnome.org/sources/orca/2.91/orca-%{version}.tar.bz2
# https://bugzilla.gnome.org/show_bug.cgi?id=647117
Patch0: orca-not-for-kde.patch
BuildRequires: python-devel >= %{python_version}
BuildRequires: brlapi-devel >= %{brlapi_version}
BuildRequires: brltty >= %{brltty_version}
BuildRequires: pyorbit-devel >= %{pyorbit_version}
BuildRequires: pygtk2-devel >= %{pygtk2_version}
BuildRequires: pyxdg
BuildRequires: PyYAML
BuildRequires: gnome-speech-devel >= %{gnome_speech_version}
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: gnome-python2-devel
BuildRequires: gnome-python2-bonobo
BuildRequires: gnome-python2-libwnck
@ -41,21 +39,23 @@ BuildRequires: gnome-python2-gconf
BuildRequires: pyatspi
BuildRequires: dbus-python
BuildRequires: gnome-doc-utils
Obsoletes: gnopernicus
Provides: gnopernicus
Obsoletes: gnopernicus
Provides: gnopernicus
Requires: gnome-mag
Requires: control-center >= %{control_center_version}
Requires: pyatspi
Requires: gnome-mag
Requires: control-center
Requires: pyatspi
# http://lists.fedoraproject.org/pipermail/desktop/2010-October/006568.html
Requires: at-spi-python
Requires: at-spi-python
Requires: gnome-python2-bonobo
Requires: gnome-python2-libwnck
Requires: gnome-python2-bonobo
Requires: gnome-python2-libwnck
Requires: gnome-python2-gconf
Requires: gnome-python2-gnome
Requires: gnome-speech
Requires: gnome-python2-gnome
Requires: gnome-speech
Requires: speech-dispatcher
%description
Orca is a flexible, extensible, and powerful assistive technology for people
@ -65,6 +65,7 @@ toolkits that support AT-SPI (e.g. the GNOME desktop).
%prep
%setup -q
%patch0 -p1 -b .not-for-kde
%build
%configure
@ -77,22 +78,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name} --with-gnome
# save space by linking identical images in translated docs
helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
for f in $helpdir/C/figures/*.png; do
b="$(basename $f)"
for d in $helpdir/*; do
if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
g="$d/figures/$b"
if [ -f "$g" ]; then
if cmp -s $f $g; then
rm "$g"; ln -s "../../C/figures/$b" "$g"
fi
fi
fi
done
done
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
%post
@ -117,10 +102,42 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/scalable/apps/orca.svg
%{_datadir}/orca
%{_datadir}/applications/orca.desktop
%{_sysconfdir}/xdg/autostart/orca-autostart.desktop
%{_mandir}/man1/orca.1.gz
%changelog
* Thu Apr 7 2011 Matthias Clasen <mclasen@redhat.com> 3.0.0-2
- Only autostart in GNOME
* Mon Apr 4 2011 Matthias Clasen <mclasen@redhat.com> 3.0.0-1
- Update to 3.0.0
- Bring the gnome-speech dependency back
* Sun Apr 3 2011 Matthias Clasen <mclasen@redhat.com> 2.91.93-2
- Drop PyYAML depencency (no longer used)
- Don't require gnome-speech (speech-dispatcher is preferred)
* Fri Mar 25 2011 Matthias Clasen <mclasen@redhat.com> 2.91.93-1
- Update to 2.91.93
* Fri Mar 25 2011 Bastien Nocera <bnocera@redhat.com> 2.91.92-2
- Use GSettings to check whether toolkit accessibility is enabled,
patch from Frederic Crozat
* Tue Mar 22 2011 Matthias Clasen <mclasen@redhat.com> 2.91.92-1
- Update to 2.91.92
* Mon Mar 3 2011 Matthias Clasen <mclasen@redhat.com> 2.91.91-1
- Update to 2.91.91
- Drop a space-saving hack
* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 2.91.90-1
- Update to 2.91.90
* Sun Feb 20 2011 Matthias Clasen <mclasen@redhat.com> 2.91.6-4
- Fix dependencies
* Thu Feb 17 2011 Bastien Nocera <bnocera@redhat.com> 2.91.6-3
- Don't remove the desktop files, as they are "no display" anyway
(this would also have removed the autostart desktop file in

2
sources
View File

@ -1 +1 @@
51b51f8753540019319d7db8948bbcd6 orca-2.91.6.tar.bz2
e5674a805075dae47d1624ddb8c0ce39 orca-3.0.0.tar.bz2

15
use-gsettings.patch Normal file
View File

@ -0,0 +1,15 @@
Index: orca-2.91.92/src/orca/orca.in
===================================================================
--- orca-2.91.92.orig/src/orca/orca.in
+++ orca-2.91.92/src/orca/orca.in
@@ -131,8 +131,8 @@ runOrca()
# all set and we don't need to muck around.
#
if [ "x$LOGNAME" != "xgdm" ] ; then
- ACCESSIBILITY_ENABLED=`gconftool-2 \
- --get /desktop/gnome/interface/accessibility`
+ ACCESSIBILITY_ENABLED=`gsettings \
+ get org.gnome.desktop.interface toolkit-accessibility`
if [ "x$ACCESSIBILITY_ENABLED" != "xtrue" ] ; then
# Because we will be running Orca in text-setup mode, we want to
# make sure it is run in a terminal window. If we're already in