--- cauldron/accerciser/current/SPECS/accerciser.spec	2011/04/18 18:07:21	87842
+++ cauldron/accerciser/current/SPECS/accerciser.spec	2011/04/18 18:09:52	87843
@@ -1,29 +1,24 @@
-Summary: An interactive Python tool for querying accessibility information
-Name: accerciser
-Version: 1.10.1
-Release: %mkrel 1
-Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
-License: BSD
-BuildRoot: %{_builddir}/%{name}-%{version}-rpmroot
-Group: Accessibility
-Url: http://live.gnome.org/Accerciser
-
-BuildArch: noarch
-
-BuildRequires: intltool
-BuildRequires: gnome-doc-utils
-Requires: gnome-python-gconf >= 2.12
-Requires: gnome-python-desktop >= 2.14
-Requires: pygtk2.0 >= 2.8
-Requires: pygtk2.0-libglade >= 2.8
-Requires: pyorbit >= 2.14
-Requires: gnome-python >= 2.12
-Requires: gnome-python-bonobo >= 2.12
-Requires: gnome-python-gtksourceview >= 2.12
-Requires: python-at-spi >= 1.23.6
-Requires: ipython
-Obsoletes: at-poke <= 0.2.3
-Provides: at-poke
+Summary:	An interactive Python tool for querying accessibility information
+Name:		accerciser
+Version:	1.12.1
+Release:	%mkrel 1
+Source0:	ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
+License:	BSD
+Group:		Accessibility
+Url:		http://live.gnome.org/Accerciser
+BuildArch:	noarch
+BuildRequires:	intltool
+BuildRequires:	gnome-doc-utils
+Requires:	gnome-python-gconf >= 2.12
+Requires:	gnome-python-desktop >= 2.14
+Requires:	pygtk2.0 >= 2.8
+Requires:	pygtk2.0-libglade >= 2.8
+Requires:	pyorbit >= 2.14
+Requires:	gnome-python >= 2.12
+Requires:	gnome-python-bonobo >= 2.12
+Requires:	gnome-python-gtksourceview >= 2.12
+Requires:	python-at-spi >= 1.23.6
+Requires:	ipython
 
 %description
 An interactive Python accessibility explorer.
@@ -32,40 +27,38 @@
 %setup -q
 
 %build
-./configure --prefix=%_prefix --libdir=%_prefix/lib --sysconfdir=%_sysconfdir --disable-scrollkeeper --without-pyreqs
+%configure2_5x \
+	--disable-scrollkeeper \
+	--disable-schemas-install \
+	--without-pyreqs
 %make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %makeinstall_std
 
 %find_lang %{name} --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%define gconf_schemas accerciser
+#omf, find_lang macro doesn't handle them
+for omf in %{buildroot}%{_datadir}/omf/*/*-??*.omf;do
+echo "%lang($(basename $omf|sed -e s/.*-// -e s/.omf//)) $(echo $omf|sed -e s!%{buildroot}!!)" >> %{name}.lang
+done
 
-%post
-%post_install_gconf_schemas %gconf_schemas
-%update_icon_cache hicolor
+%clean
+rm -rf %{buildroot}
 
 %preun
-%preun_uninstall_gconf_schemas %gconf_schemas
-
-%postun
-%clean_icon_cache hicolor
+%preun_uninstall_gconf_schemas %{name}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS README NEWS 
-%{_sysconfdir}/gconf/schemas/accerciser.schemas
-%{_bindir}/accerciser
-%{py_puresitedir}/accerciser
-%{_datadir}/omf/accerciser/*
-%{_datadir}/accerciser/*
-%{_datadir}/icons/hicolor/*/apps/accerciser.*
-%{_datadir}/applications/accerciser.desktop
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/%{name}
+%{py_puresitedir}/%{name}
+%dir %{_datadir}/omf/%{name}
+%{_datadir}/omf/%{name}/%{name}-C.omf
+%{_datadir}/%{name}
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/*
-
-