|
@@ -1,15 +1,18 @@
|
|
# Note that this is NOT a relocatable package
|
|
# Note that this is NOT a relocatable package
|
|
|
|
|
|
-%define glib2_base_version 2.24.1
|
|
|
|
|
|
+%define glib2_base_version 2.26.0
|
|
%define glib2_version %{glib2_base_version}-1
|
|
%define glib2_version %{glib2_base_version}-1
|
|
-%define pango_base_version 1.28.0
|
|
|
|
|
|
+%define pango_base_version 1.28.3
|
|
%define pango_version %{pango_base_version}-1
|
|
%define pango_version %{pango_base_version}-1
|
|
-%define atk_base_version 1.30.0
|
|
|
|
|
|
+%define atk_base_version 1.32.0
|
|
%define atk_version %{atk_base_version}-1
|
|
%define atk_version %{atk_base_version}-1
|
|
-%define cairo_base_version 1.8.10
|
|
|
|
|
|
+%define cairo_base_version 1.10.0
|
|
%define cairo_version %{cairo_base_version}-1
|
|
%define cairo_version %{cairo_base_version}-1
|
|
|
|
+%define gdkpixbuf2_base_version 2.22.0
|
|
|
|
+%define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
|
|
|
|
+%define gobject_introspection_version 0.9.8
|
|
|
|
|
|
-%define base_version 2.20.1
|
|
|
|
|
|
+%define base_version 2.22.0
|
|
%define bin_version 2.10.0
|
|
%define bin_version 2.10.0
|
|
|
|
|
|
# biarch support
|
|
# biarch support
|
|
@@ -23,14 +26,14 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
|
|
Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
|
|
Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
|
|
Name: gtk2
|
|
Name: gtk2
|
|
Version: %{base_version}
|
|
Version: %{base_version}
|
|
-Release: 2%{?_dist_release}
|
|
|
|
|
|
+Release: 1%{?_dist_release}
|
|
License: LGPL
|
|
License: LGPL
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
|
|
|
|
Source: gtk+-%{version}.tar.bz2
|
|
Source: gtk+-%{version}.tar.bz2
|
|
|
|
|
|
# biarch support
|
|
# biarch support
|
|
-Patch0: gtk2-2.18.5-lib64.patch
|
|
|
|
|
|
+Patch0: gtk2-2.21.6-lib64.patch
|
|
|
|
|
|
Patch100: gtk+-2.8.19-vine-default-theme.patch
|
|
Patch100: gtk+-2.8.19-vine-default-theme.patch
|
|
|
|
|
|
@@ -38,8 +41,9 @@ BuildRequires: atk-devel >= %{atk_version}
|
|
BuildRequires: pango-devel >= %{pango_version}
|
|
BuildRequires: pango-devel >= %{pango_version}
|
|
BuildRequires: glib2-devel >= %{glib2_version}
|
|
BuildRequires: glib2-devel >= %{glib2_version}
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
|
+BuildRequires: gdk-pixbuf2-devel >= %{gdkpixbuf2_version}
|
|
BuildRequires: libtiff-devel >= 3.7
|
|
BuildRequires: libtiff-devel >= 3.7
|
|
-BuildRequires: libjpeg-devel
|
|
|
|
|
|
+BuildRequires: libjpeg-turbo-devel
|
|
BuildRequires: libpng-devel
|
|
BuildRequires: libpng-devel
|
|
BuildRequires: jasper-devel
|
|
BuildRequires: jasper-devel
|
|
BuildRequires: gtk-doc
|
|
BuildRequires: gtk-doc
|
|
@@ -56,6 +60,7 @@ BuildRequires: libXfixes-devel
|
|
BuildRequires: libXinerama-devel
|
|
BuildRequires: libXinerama-devel
|
|
BuildRequires: libXcomposite-devel
|
|
BuildRequires: libXcomposite-devel
|
|
BuildRequires: libXdamage-devel
|
|
BuildRequires: libXdamage-devel
|
|
|
|
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
|
|
|
|
|
|
BuildRoot: %{_tmppath}/gtk-%{version}-root
|
|
BuildRoot: %{_tmppath}/gtk-%{version}-root
|
|
Obsoletes: gtk+-gtkbeta
|
|
Obsoletes: gtk+-gtkbeta
|
|
@@ -96,6 +101,7 @@ Summary(ja): GTK+ (GIMP ツールキット) アプリケーション開発ツー
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
Requires: gtk2 = %{version}
|
|
Requires: gtk2 = %{version}
|
|
Requires: pango-devel >= %{pango_version}
|
|
Requires: pango-devel >= %{pango_version}
|
|
|
|
+Requires: gdk-pixbuf2-devel >= %{gdkpixbuf2_version}
|
|
Requires: atk-devel >= %{atk_version}
|
|
Requires: atk-devel >= %{atk_version}
|
|
Requires: glib2-devel >= %{glib2_version}
|
|
Requires: glib2-devel >= %{glib2_version}
|
|
Requires: libX11-devel, libXcursor-devel, libXinerama-devel
|
|
Requires: libX11-devel, libXcursor-devel, libXinerama-devel
|
|
@@ -123,6 +129,7 @@ Group: System Environment/Libraries
|
|
Requires(post): compat32-glib2 >= %{glib2_version}
|
|
Requires(post): compat32-glib2 >= %{glib2_version}
|
|
Requires(post): compat32-atk >= %{atk_version}
|
|
Requires(post): compat32-atk >= %{atk_version}
|
|
Requires(post): compat32-pango >= %{pango_version}
|
|
Requires(post): compat32-pango >= %{pango_version}
|
|
|
|
+Requires(post): compat32-gdk-pixbuf2 >= %{gdkpixbuf2_version}
|
|
Requires(post): compat32-libSM >= 1.1.0
|
|
Requires(post): compat32-libSM >= 1.1.0
|
|
Requires(post): compat32-libtiff >= 3.7
|
|
Requires(post): compat32-libtiff >= 3.7
|
|
Requires: compat32-libXrandr >= 1.3.0
|
|
Requires: compat32-libXrandr >= 1.3.0
|
|
@@ -174,7 +181,8 @@ fi
|
|
--enable-debug=minimum \
|
|
--enable-debug=minimum \
|
|
--disable-rebuilds \
|
|
--disable-rebuilds \
|
|
--disable-glibtest \
|
|
--disable-glibtest \
|
|
- --with-included-loaders=png
|
|
|
|
|
|
+ --with-included-loaders=png \
|
|
|
|
+ --enable-introspection=yes
|
|
|
|
|
|
make ARCH=%{_arch}
|
|
make ARCH=%{_arch}
|
|
#make
|
|
#make
|
|
@@ -222,8 +230,6 @@ done
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
cp $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 \
|
|
cp $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 \
|
|
$RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0%{_query_suffix}
|
|
$RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0%{_query_suffix}
|
|
- cp $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders \
|
|
|
|
- $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders%{_query_suffix}
|
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
# Remove unpackaged files
|
|
# Remove unpackaged files
|
|
@@ -237,30 +243,25 @@ rm -rf $RPM_BUILD_ROOT
|
|
%post
|
|
%post
|
|
/sbin/ldconfig
|
|
/sbin/ldconfig
|
|
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
-%{_bindir}/gdk-pixbuf-query-loaders > %{_sysconfdir}/gtk-2.0/%{_arch}/gdk-pixbuf.loaders
|
|
|
|
|
|
|
|
%postun
|
|
%postun
|
|
/sbin/ldconfig
|
|
/sbin/ldconfig
|
|
if [ $1 = 0 ]; then
|
|
if [ $1 = 0 ]; then
|
|
/bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
/bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
- /bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gdk-pixbuf.loaders
|
|
|
|
fi
|
|
fi
|
|
|
|
|
|
%triggerpostun -- gtk2 <= 2.8.11
|
|
%triggerpostun -- gtk2 <= 2.8.11
|
|
/bin/rm -f %{_sysconfdir}/gtk-2.0/gtk.immodules
|
|
/bin/rm -f %{_sysconfdir}/gtk-2.0/gtk.immodules
|
|
-/bin/rm -f %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
|
|
|
|
|
|
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%post -n compat32-%{name}
|
|
%post -n compat32-%{name}
|
|
/sbin/ldconfig
|
|
/sbin/ldconfig
|
|
%{_bindir}/gtk-query-immodules-2.0%{_query_suffix} > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
%{_bindir}/gtk-query-immodules-2.0%{_query_suffix} > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
-%{_bindir}/gdk-pixbuf-query-loaders%{_query_suffix} > %{_sysconfdir}/gtk-2.0/%{_arch}/gdk-pixbuf.loaders
|
|
|
|
|
|
|
|
%postun -n compat32-%{name}
|
|
%postun -n compat32-%{name}
|
|
/sbin/ldconfig
|
|
/sbin/ldconfig
|
|
if [ $1 = 0 ]; then
|
|
if [ $1 = 0 ]; then
|
|
/bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
/bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
|
|
- /bin/rm -f %{_sysconfdir}/gtk-2.0/%{_arch}/gdk-pixbuf.loaders
|
|
|
|
fi
|
|
fi
|
|
%endif
|
|
%endif
|
|
|
|
|
|
@@ -269,13 +270,10 @@ fi
|
|
%doc AUTHORS COPYING ChangeLog NEWS README
|
|
%doc AUTHORS COPYING ChangeLog NEWS README
|
|
%{_bindir}/gtk-demo
|
|
%{_bindir}/gtk-demo
|
|
%{_bindir}/gtk-builder-convert
|
|
%{_bindir}/gtk-builder-convert
|
|
-%{_bindir}/gdk-pixbuf-query-loaders
|
|
|
|
%{_bindir}/gtk-query-immodules-2.0
|
|
%{_bindir}/gtk-query-immodules-2.0
|
|
%{_bindir}/gtk-update-icon-cache
|
|
%{_bindir}/gtk-update-icon-cache
|
|
%{_libdir}/libgtk-x11-2.0.so.*
|
|
%{_libdir}/libgtk-x11-2.0.so.*
|
|
%{_libdir}/libgdk-x11-2.0.so.*
|
|
%{_libdir}/libgdk-x11-2.0.so.*
|
|
-%{_libdir}/libgdk_pixbuf-2.0.so.*
|
|
|
|
-%{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
|
|
|
|
%{_libdir}/libgailutil.so.*
|
|
%{_libdir}/libgailutil.so.*
|
|
%dir %{_libdir}/gtk-2.0
|
|
%dir %{_libdir}/gtk-2.0
|
|
%{_libdir}/gtk-2.0/%{bin_version}
|
|
%{_libdir}/gtk-2.0/%{bin_version}
|
|
@@ -287,6 +285,7 @@ fi
|
|
%dir %{_sysconfdir}/gtk-2.0
|
|
%dir %{_sysconfdir}/gtk-2.0
|
|
%dir %{_sysconfdir}/gtk-2.0/%{_arch}
|
|
%dir %{_sysconfdir}/gtk-2.0/%{_arch}
|
|
%{_sysconfdir}/gtk-2.0/im-multipress.conf
|
|
%{_sysconfdir}/gtk-2.0/im-multipress.conf
|
|
|
|
+%{_libdir}/girepository-1.0
|
|
|
|
|
|
%files devel
|
|
%files devel
|
|
%defattr(-, root, root)
|
|
%defattr(-, root, root)
|
|
@@ -297,8 +296,8 @@ fi
|
|
%{_mandir}/man1/*
|
|
%{_mandir}/man1/*
|
|
%{_includedir}/*
|
|
%{_includedir}/*
|
|
%{_datadir}/aclocal/*
|
|
%{_datadir}/aclocal/*
|
|
-%{_bindir}/gdk-pixbuf-csource
|
|
|
|
%{_libdir}/pkgconfig/*
|
|
%{_libdir}/pkgconfig/*
|
|
|
|
+%{_datadir}/gir-1.0
|
|
%doc tmpdocs/tutorial
|
|
%doc tmpdocs/tutorial
|
|
%doc tmpdocs/examples
|
|
%doc tmpdocs/examples
|
|
|
|
|
|
@@ -306,12 +305,9 @@ fi
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%files -n compat32-%{name}
|
|
%files -n compat32-%{name}
|
|
%defattr(-, root, root)
|
|
%defattr(-, root, root)
|
|
-%{_bindir}/gdk-pixbuf-query-loaders%{_query_suffix}
|
|
|
|
%{_bindir}/gtk-query-immodules-2.0%{_query_suffix}
|
|
%{_bindir}/gtk-query-immodules-2.0%{_query_suffix}
|
|
%{_libdir}/libgtk-x11-2.0.so.*
|
|
%{_libdir}/libgtk-x11-2.0.so.*
|
|
%{_libdir}/libgdk-x11-2.0.so.*
|
|
%{_libdir}/libgdk-x11-2.0.so.*
|
|
-%{_libdir}/libgdk_pixbuf-2.0.so.*
|
|
|
|
-%{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
|
|
|
|
%{_libdir}/libgailutil.so.*
|
|
%{_libdir}/libgailutil.so.*
|
|
%dir %{_libdir}/gtk-2.0
|
|
%dir %{_libdir}/gtk-2.0
|
|
%{_libdir}/gtk-2.0/%{bin_version}
|
|
%{_libdir}/gtk-2.0/%{bin_version}
|
|
@@ -329,6 +325,22 @@ fi
|
|
%endif
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add BuildRequires: gdk-pixbuf2-devel, gobject-introspection-devel
|
|
|
|
+- remove BuildRequires: gtk2-devel = 2.21.2
|
|
|
|
+- add configure option (--enable-instrospection=yes)
|
|
|
|
+
|
|
|
|
+* Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.21.3-1
|
|
|
|
+- new upstream release
|
|
|
|
+- fix Patch0
|
|
|
|
+- add BuildRequires: gtk2-devel = 2.21.2 (2.21.3 only)
|
|
|
|
+- add Requires: gdk-pixbuf2-devel (devel package)
|
|
|
|
+
|
|
|
|
+* Sat Oct 02 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.21.2-1
|
|
|
|
+- new upstream release
|
|
|
|
+- change BuildRequires: libjpeg-turbo-devel instead of libjpeg-devel
|
|
|
|
+
|
|
* Tue Sep 21 2010 IWAI, Masaharu <iwai@alib.jp> 2.20.1-2
|
|
* Tue Sep 21 2010 IWAI, Masaharu <iwai@alib.jp> 2.20.1-2
|
|
- build with rpm-4.8.1-1 for pkg-config file
|
|
- build with rpm-4.8.1-1 for pkg-config file
|
|
|
|
|