- updated to 3.22.0 (GNOME 3 now)

diff --git a/accerciser.spec b/accerciser.spec
index 2e2d757fe78c7bb47a4edd160e8d5db76e9aa1a2..09092d6e7ae9edf673a9e8b09d6c0c864659a6a9 100644 (file)
--- a/accerciser.spec
+++ b/accerciser.spec
@@ -1,37 +1,42 @@
 Summary:       An interactive Python tool for querying accessibility information
 Summary(pl.UTF-8):     Interaktywne narzędzie w Pythonie do pobierania informacji o dostępności
 Name:          accerciser
-Version:       1.12.1
+Version:       3.22.0
 Release:       1
 License:       BSD
 Group:         X11/Applications/Accessibility
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/accerciser/1.12/%{name}-%{version}.tar.bz2
-# Source0-md5: b5e754c8bc89387a3cd3ec6c7f702aaa
-URL:           http://live.gnome.org/Accerciser
-BuildRequires: GConf2-devel >= 2.24.0
-BuildRequires: autoconf
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/accerciser/3.22/%{name}-%{version}.tar.xz
+# Source0-md5: a6885691d7639c34ec83d5d6ff5389fe
+URL:           https://wiki.gnome.org/Apps/Accerciser
+BuildRequires: at-spi2-core-devel >= 2.5.2
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-tools
-BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gtk+3-devel >= 3.1.13
 BuildRequires: intltool >= 0.40.0
-BuildRequires: libxml2-progs
 BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.4
+BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-pygobject3-devel >= 3.0
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.612
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+BuildRequires: yelp-tools
+Requires(post,postun): glib2 >= 1:2.26.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
-Requires(post,preun):  GConf2
-Requires:      python-gnome
-Requires:      python-gnome-desktop-librsvg
-Requires:      python-gnome-desktop-libwnck
-Requires:      python-gnome-gconf
-Requires:      python-gtksourceview2
-Requires:      python-ipython
-Requires:      python-pyatspi
-Requires:      python-pygtk-gtk
+Requires:      atk
+Requires:      gdk-pixbuf2 >= 2.0
+Requires:      gtk+3 >= 3.1.13
+Requires:      librsvg >= 2.0
+Requires:      libwnck >= 3.0
+Requires:      pango
+Requires:      python3-ipython
+Requires:      python3-modules >= 1:3.2
+Requires:      python3-pyatspi
+Requires:      python3-pycairo
+Requires:      python3-pygobject3 >= 3.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,8 +56,7 @@ Interaktywny eksplorator dostępności w Pythonie.
 %{__autoconf}
 %{__automake}
 %configure \
-       --without-pyreqs \
-       --disable-scrollkeeper
+       am_cv_python_pythondir=%{py3_sitescriptdir}
 %{__make}
 
 %install
@@ -61,30 +65,29 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%py_postclean
-
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install accerciser.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall accerciser.schemas
-
 %postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/accerciser
+%{py3_sitescriptdir}/accerciser
 %{_datadir}/accerciser
+%{_datadir}/appdata/org.gnome.accerciser.appdata.xml
+%{_datadir}/glib-2.0/schemas/org.a11y.Accerciser.gschema.xml
 %{_desktopdir}/accerciser.desktop
+%{_iconsdir}/hicolor/*x*/apps/accerciser.png
+%{_iconsdir}/hicolor/scalable/apps/accerciser.svg
+%{_iconsdir}/hicolor/symbolic/apps/accerciser-symbolic.svg
 %{_mandir}/man1/accerciser.1*
-%{_iconsdir}/hicolor/*/*/*
-%{py_sitescriptdir}/accerciser
-%{_sysconfdir}/gconf/schemas/accerciser.schemas