Spec cleanup

.abf.yml

@@ -1,2 +1,2 @@
-  atk-2.8.0.tar.xz: e8a9dacd22b31a6cb733ce66fb1c220cc6720970
+sources:
   atk-2.12.0.tar.xz: 3ad6fc3c530b3c848cd2cad38a7c68191426baae

atk1.0.spec

@@ -1,26 +1,25 @@
-%define enable_gtkdoc	0
+%bcond_with gtkdoc
 
-%define api		1.0
+%define api 1.0
-%define major	0
+%define major 0
-%define pkgname	atk
+%define pkgname atk
 %define libname %mklibname %{pkgname} %{api} %{major}
 %define girname %mklibname %{pkgname}-gir %{api}
-%define develname %mklibname -d %{name}
+%define devname %mklibname %{name} -d
 
 Summary:	Accessibility features for Gtk+
 Name:		%{pkgname}%{api}
 Version:	2.12.0
-Release:	2
+Release:	4
-License:	LGPLv2+
+License:	LGPLv2.1+
 Group:		Accessibility
 Url:		http://developer.gnome.org/projects/gap/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{pkgname}/2.12/%{pkgname}-%{version}.tar.xz
-
+%if %{with gtkdoc}
-%if %{enable_gtkdoc}
 BuildRequires:	gtk-doc >= 1.11-3
 %endif
-BuildRequires: pkgconfig(glib-2.0) >= 2.5.7
+BuildRequires:	pkgconfig(glib-2.0) >= 2.5.7
-BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires:	pkgconfig(gobject-introspection-1.0)
 
 %description
 Accessibility means providing system infrastructure that allows add-on
@@ -33,6 +32,11 @@ keyboards, and head-mounted pointers replace mice.
 ATK, the Accessibility Tookit, is used to obtain accessibily information
 from GTK+ and GNOME widgets.
 
+%files common -f %{pkgname}10.lang
+%doc README
+
+#----------------------------------------------------------------------------
+
 %package common
 Summary:	Data files used by atk
 Group:		System/Libraries
@@ -43,11 +47,13 @@ from GTK+ and GNOME widgets.
 
 This package contains data used by atk library.
 
+#----------------------------------------------------------------------------
+
 %package -n %{libname}
 Summary:	Accessibility features for Gtk+
 Group:		System/Libraries
-Suggests:	%{name}-common >= %{version}-%{release}
+Suggests:	%{name}-common >= %{EVRD}
-Provides:	lib%{name} = %{version}-%{release}
+Provides:	lib%{name} = %{EVRD}
 Conflicts:	gir-repository < 0.6.5-4
 
 %description -n %{libname}
@@ -58,34 +64,55 @@ through applications, determine the state of controls, and read text via
 text to speech conversion. On-screen keyboards replace physical
 keyboards, and head-mounted pointers replace mice.
 
+%files -n %{libname}
+%{_libdir}/libatk-%{api}.so.%{major}*
+
+#----------------------------------------------------------------------------
+
 %package -n %{girname}
 Summary:	GObject introspection interface library for %{pkgname}
 Group:		System/Libraries
+Requires:	%{libname} = %{EVRD}
 Obsoletes:	%{_lib}atk1.0_0 < 2.4.0-1
 
 %description -n %{girname}
 GObject introspection interface library for %{pkgname}.
 
-%package -n %{develname}
+%files -n %{girname}
+%{_libdir}/girepository-1.0/Atk-%{api}.typelib
+
+#----------------------------------------------------------------------------
+
+%package -n %{devname}
 Summary:	Stuff for developing with atk
 Group:		Development/C
-Provides:	%{pkgname}-devel = %{version}-%{release}
+Requires:	%{libname} = %{EVRD}
-Requires:	%{libname} = %{version}-%{release}
+Requires:	%{girname} = %{EVRD}
-Requires:	%{girname} = %{version}-%{release}
+Provides:	%{pkgname}-devel = %{EVRD}
-Obsoletes:	%{_lib}atk1.0_0-devel
+Obsoletes:	%{_lib}atk1.0_0-devel < 2.12.0
 Conflicts:	gir-repository < 0.6.5-4
 
-%description -n %{develname}
+%description -n %{devname}
 ATK, the Accessibility Tookit, is used to obtain accessibily information
 from GTK+ and GNOME widgets.
 
+%files -n %{devname}
+%doc AUTHORS ChangeLog NEWS
+%doc %{_datadir}/gtk-doc/html/*
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+%{_datadir}/gir-1.0/Atk-%{api}.gir
+
+#----------------------------------------------------------------------------
+
 %prep
-%setup -q -n %{pkgname}-%{version}
+%setup -qn %{pkgname}-%{version}
 
 %build
 %configure2_5x \
 	--disable-static \
-%if %{enable_gtkdoc}
+%if %{with gtkdoc}
 	--enable-gtk-doc
 %endif
 
@@ -93,21 +120,5 @@ from GTK+ and GNOME widgets.
 
 %install
 %makeinstall_std
+
 %find_lang %{pkgname}10
-
-%files common -f %{pkgname}10.lang
-%doc README
-
-%files -n %{libname}
-%{_libdir}/libatk-%{api}.so.%{major}*
-
-%files -n %{girname}
-%{_libdir}/girepository-1.0/Atk-%{api}.typelib
-
-%files -n %{develname}
-%doc AUTHORS ChangeLog NEWS
-%doc %{_datadir}/gtk-doc/html/*
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
-%{_datadir}/gir-1.0/Atk-%{api}.gir