From 8e83676b5a0e0ba3e1fe86ca770c1a3a17d962c3 Mon Sep 17 00:00:00 2001 From: Rosa Date: Wed, 1 Feb 2012 16:57:00 +0400 Subject: [PATCH] Automatic import for version 2.2.0 --- .abf.yml | 2 +- atk1.0.spec | 97 +++++++++++++++++++++++++---------------------------- 2 files changed, 47 insertions(+), 52 deletions(-) diff --git a/.abf.yml b/.abf.yml index 32ccf54..381af4c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "atk-2.0.1.tar.xz": 2dce2cc2c7dfc8fbe2e6de8e8f9aeaa02710c289 + "atk-2.2.0.tar.xz": b9808b77c7905eb46fc2b64587ef93beab37470a diff --git a/atk1.0.spec b/atk1.0.spec index 27fa69d..bb31868 100644 --- a/atk1.0.spec +++ b/atk1.0.spec @@ -1,32 +1,24 @@ -# enable_gtkdoc: Toggle if gtkdoc stuff should be rebuilt -# 0 = no -# 1 = yes %define enable_gtkdoc 0 %define api_version 1.0 %define lib_major 0 %define pkgname atk - -# Version of glib needed -%define req_glib2_version 2.5.7 - %define lib_name %mklibname %{name}_ %{lib_major} %define develname %mklibname -d %{name} Name: %{pkgname}%{api_version} -Version: 2.0.1 -Release: %mkrel 1 +Version: 2.2.0 +Release: 4 Summary: Accessibility features for Gtk+ License: LGPLv2+ Group: Accessibility Url: http://developer.gnome.org/projects/gap/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/%pkgname/%pkgname-%version.tar.xz -Buildroot: %_tmppath/%name-%{version}-root -BuildRequires: libglib2-devel >= %{req_glib2_version} +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{pkgname}/%{pkgname}-%{version}.tar.xz %if %enable_gtkdoc -BuildRequires: gtk-doc >= 1.11-3mdv +BuildRequires: gtk-doc >= 1.11-3 %endif -BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig(glib-2.0) >= 2.5.7 +BuildRequires: pkgconfig(gobject-introspection-1.0) %description Accessibility means providing system infrastructure that allows add-on @@ -42,9 +34,9 @@ from GTK+ and GNOME widgets. %package common Summary: Data files used by atk Group: System/Libraries -Conflicts: %{_lib}atk1.0_0 < 1.13.1-2mdv +Conflicts: %{_lib}atk1.0_0 < 1.13.1-2 # 64bit atk1.0-common conflicts with old 32bit lib as well -Anssi -Conflicts: libatk1.0_0 < 1.13.1-2mdv +Conflicts: libatk1.0_0 < 1.13.1-2 %description common ATK, the Accessibility Tookit, is used to obtain accessibily information @@ -55,13 +47,12 @@ This package contains data used by atk library. %package -n %{lib_name} Summary: Accessibility features for Gtk+ Group: System/Libraries -Requires: common-licenses -Obsoletes: %{pkgname} lib%{pkgname} +Suggests: %{name}-common >= %{version}-%{release} Provides: %{pkgname} = %{version}-%{release} Provides: lib%{pkgname} = %{version}-%{release} Provides: lib%{name} = %{version}-%{release} -Requires: %{name}-common >= %{version}-%{release} -Conflicts: gir-repository < 0.6.5-4mdv +Obsoletes: %{pkgname} lib%{pkgname} +Conflicts: gir-repository < 0.6.5-4 %description -n %{lib_name} Accessibility means providing system infrastructure that allows add-on @@ -76,15 +67,12 @@ Summary: Stuff for developing with atk Group: Development/C Obsoletes: %{pkgname}-devel lib%{pkgname}-devel Provides: %{pkgname}-devel = %{version}-%{release} -Provides: lib%{pkgname}-devel = %{version}-%{release} -Provides: lib%{name}-devel = %{version}-%{release} -Requires: %{lib_name} = %{version} -Requires: libglib2-devel >= %{req_glib2_version} +Requires: %{lib_name} = %{version}-%{release} Conflicts: libatk10-devel Obsoletes: %mklibname -d %{name}_ 0 -Conflicts: gir-repository < 0.6.5-4mdv +Conflicts: gir-repository < 0.6.5-4 -%description -n %develname +%description -n %{develname} ATK, the Accessibility Tookit, is used to obtain accessibily information from GTK+ and GNOME widgets. @@ -92,9 +80,8 @@ from GTK+ and GNOME widgets. %setup -q -n %{pkgname}-%{version} %build - %configure2_5x \ - --enable-static \ + --disable-static \ %if %enable_gtkdoc --enable-gtk-doc %endif @@ -102,45 +89,53 @@ from GTK+ and GNOME widgets. %make %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %makeinstall_std - +find %{buildroot} -name "*.la" -delete %{find_lang} %{pkgname}10 -%clean -rm -rf $RPM_BUILD_ROOT - -%if %mdkversion < 200900 -%post -n %{lib_name} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%postun -n %{lib_name} -p /sbin/ldconfig -%endif - %files common -f %{pkgname}10.lang -%defattr(-,root,root) %doc README %files -n %{lib_name} -%defattr(-,root,root) %{_libdir}/libatk-%{api_version}.so.%{lib_major}* -%_libdir/girepository-1.0/Atk-%{api_version}.typelib +%{_libdir}/girepository-1.0/Atk-%{api_version}.typelib -%files -n %develname -%defattr(-,root,root) +%files -n %{develname} %doc AUTHORS ChangeLog NEWS %doc %{_datadir}/gtk-doc/html/* %{_includedir}/* %{_libdir}/*.so -%{_libdir}/*.a -%{_libdir}/*.la %{_libdir}/pkgconfig/* -%_datadir/gir-1.0/Atk-%{api_version}.gir +%{_datadir}/gir-1.0/Atk-%{api_version}.gir %changelog -* Mon Jun 13 2011 Götz Waschk 2.0.1-1mdv2011.0 +* Sat Dec 03 2011 Matthew Dawkins 2.2.0-4 ++ Revision: 737360 +- really disable static build now +- rebuild to remove reqs in devel pkg +- removed .la files +- disabled static build +- removed old ldconfig scriptlets +- removed dup devel provides +- converted BRs to pkgconfig provides + +* Sun Nov 06 2011 Paulo Andrade 2.2.0-3 ++ Revision: 722053 +- Revert removal of .la files. + +* Sat Nov 05 2011 Zé 2.2.0-2 ++ Revision: 720056 +- clean defattr and section clean +- clean .la files +- rebuild + +* Mon Oct 31 2011 Matthew Dawkins 2.2.0-1 ++ Revision: 708113 +- new version 2.2.0 + +* Mon Jun 13 2011 Götz Waschk 2.0.1-1 + Revision: 684928 - new version - xz tarball @@ -242,7 +237,7 @@ rm -rf $RPM_BUILD_ROOT - rebuild - kill re-definition of %%buildroot on Pixel's request - + Olivier Blin + + Olivier Blin - restore BuildRoot * Mon Sep 17 2007 Götz Waschk 1.20.0-1mdv2008.0