From: Patryk Kaczmarek Date: Mon, 27 Apr 2015 13:11:03 +0000 (+0200) Subject: Tizen 2.4 spin repo configuration X-Git-Tag: accepted/tizen/common/20160427.143914~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c7f5940392932bb75b0fd0364c6eb97a5078076;p=platform%2Fupstream%2Fatk.git Tizen 2.4 spin repo configuration Change-Id: I4f21d433d0489c539ac33b33334e3d940dc83479 Signed-off-by: Patryk Kaczmarek --- diff --git a/Makefile.am b/Makefile.am index 6c5fe01..608dc7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Process this file with automake to create Makefile.in. ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS=atk tests docs po build +SUBDIRS=atk tests docs build EXTRA_DIST = \ MAINTAINERS \ @@ -10,13 +10,12 @@ EXTRA_DIST = \ atk.spec.in \ atk.spec \ atk-zip.sh.in \ - m4/introspection.m4 \ config.h.win32 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atk.pc -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection +DISTCHECK_CONFIGURE_FLAGS = DISTCLEANFILES = \ atk-uninstalled.pc \ diff --git a/atk/Makefile.am b/atk/Makefile.am index c049470..c7152df 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -158,35 +158,6 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile && rm -f tmp-atk-enum-types.c \ && echo timestamp > $(@F) - -if HAVE_INTROSPECTION -introspection_sources = \ - $(atk_headers) \ - $(atk_sources) -introspection_generated_sources = \ - $(top_builddir)/atk/atkversion.h \ - atk-enum-types.c \ - atk-enum-types.h - -Atk-1.0.gir: libatk-1.0.la Makefile -Atk_1_0_gir_INCLUDES = GObject-2.0 -Atk_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -Atk_1_0_gir_LIBS = libatk-1.0.la -Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk --warn-all --c-include "atk/atk.h" -Atk_1_0_gir_FILES = \ - $(addprefix $(srcdir)/, $(introspection_sources)) \ - $(introspection_generated_sources) -INTROSPECTION_GIRS += Atk-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif - # ---------- Win32 stuff ---------- if OS_WIN32 diff --git a/autogen.sh b/autogen.sh index 615d8d8..a36eba3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,15 +1,32 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. -PKG_NAME="atk" -REQUIRED_AUTOMAKE_VERSION=1.7 +olddir=`pwd` +cd "$srcdir" -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} +if test -z $GTKDOCIZE; then + echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." + rm -f gtk-doc.make + cat > gtk-doc.make <@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff --git a/packaging/atk.spec b/packaging/atk.spec index 9f0824b..097876c 100644 --- a/packaging/atk.spec +++ b/packaging/atk.spec @@ -1,43 +1,37 @@ -%bcond_with introspection %define baseline 2.12 -%define api_level 1.0 -%define api_level_alpha 10 - - Name: atk Version: 2.12.0 Release: 0 License: LGPL-2.0+ Summary: An Accessibility ToolKit Url: http://www.gtk.org/ -#X-Vc-Url: git://git.gnome.org/atk Group: System/Libraries Source: http://download.gnome.org/sources/%{name}/%{baseline}/%{name}-%{version}.tar.xz Source98: baselibs.conf Source1001: %{name}.manifest -BuildRequires: gettext-tools -BuildRequires: gnome-common -BuildRequires: gtk-doc + BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel >= 2.35.2 +BuildRequires: intltool +BuildRequires: which %if %{with introspection} BuildRequires: gobject-introspection-devel %endif -Requires: lib%{name} +Requires: libatk %description The ATK library provides a set of accessibility interfaces. By supporting the ATK interfaces, an application or toolkit can be used with screen readers, magnifiers, and alternate input devices. -%package -n lib%{name} +%package -n libatk Summary: An Accessibility ToolKit Group: System/Libraries Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -%description -n lib%{name} +%description -n libatk The ATK library provides a set of accessibility interfaces. By supporting the ATK interfaces, an application or toolkit can be used with screen readers, magnifiers, and alternate input devices. @@ -55,64 +49,41 @@ This package provides the GObject Introspection bindings for ATK. %package devel Summary: Include Files and Libraries mandatory for Development -Group: System/Libraries -Requires: lib%{name} = %{version}-%{release} -%if %{with introspection} -Requires: typelib-Atk = %{version}-%{release} -%endif +Group: Development/Libraries/GNOME +Requires: libatk = %{version} %description devel This package contains all necessary include files and libraries needed to develop applications that require these. - %prep %setup -q -cp %{SOURCE1001} . %build -NOCONFIGURE=1 ./autogen.sh - -%configure \ +%autogen \ --disable-static - -%__make %{?_smp_mflags} - +make %{?_smp_mflags} %install %make_install -install -d %{buildroot}/usr/share/help +%fdupes %{buildroot} -%find_lang %{name}%{api_level_alpha} -fdupes %{buildroot} +mkdir -p %{buildroot}/usr/share/license +cp -f COPYING %{buildroot}/usr/share/license/%{name} -%post -n lib%{name} -p /sbin/ldconfig +%post -n libatk -p /sbin/ldconfig -%postun -n lib%{name} -p /sbin/ldconfig +%postun -n libatk -p /sbin/ldconfig -%files -n lib%{name} -%manifest %{name}.manifest +%files -n libatk %defattr(-, root, root) -%license COPYING +%doc COPYING +/usr/share/license/%{name} %{_libdir}/lib*.so.* - -%if %{with introspection} -%files -n typelib-Atk -%manifest %{name}.manifest -%defattr(-, root, root) -%{_libdir}/girepository-%{api_level}/Atk-%{api_level}.typelib -%endif - %files devel -%manifest %{name}.manifest %defattr(-, root, root) -%{_includedir}/%{name}-%{api_level} +%{_includedir}/atk-1.0 %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%if %{with introspection} -%{_datadir}/gir-%{api_level}/*.gir -%endif - -%lang_package -f %{name}%{api_level_alpha}