Mailinglist Archive: opensuse-commit (762 mails)

< Previous Next >
commit gdk-pixbuf for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 09 Aug 2010 15:15:54 +0200
  • Message-id: <20100809131554.34389202B1@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gdk-pixbuf for openSUSE:Factory
checked in at Mon Aug 9 15:15:54 CEST 2010.



--------
New Changes file:

--- /dev/null 2010-05-08 11:31:08.000000000 +0200
+++ gdk-pixbuf/gdk-pixbuf.changes 2010-08-09 15:05:23.000000000 +0200
@@ -0,0 +1,57 @@
+-------------------------------------------------------------------
+Fri Jul 23 08:31:35 CEST 2010 - vuntz@xxxxxxxxxxxx
+
+- Update to version 2.21.6:
+ + Drop aliasing hacks, use -Bsymbolic-functions
+ + Support NOCONFIGURE in autogen.sh
+ + Check for different versions of libpng
+
+-------------------------------------------------------------------
+Wed Jul 21 11:06:22 CEST 2010 - vuntz@xxxxxxxxxxxx
+
+- Improve summaries and descriptions.
+- Change gobject-introspection-devel and libpng-devel BuildRequires
+ to pkgconfig(gobject-introspection-1.0) and pkgconfig(libpng).
+- Add libjasper-devel, pkgconfig(x11) BuildRequires, and explicit
+ libjpeg-devel.
+- Add baselibs.conf, and rename gdk-pixbuf-query-loaders on 64
+ bits.
+- Make libgdk_pixbuf-2_0-0 provide gdk-pixbuf to make the lang
+ package installable.
+- Add Recommends for the lang package to libgdk_pixbuf-2_0-0.
+- Move conflicts with gtk2 < 2.21 to libgdk_pixbuf-2_0-0.
+- Stop renaming gdk-pixbuf-query-loaders to
+ gdk-pixbuf-query-loaders-2.0: they're no issue with parallel
+ instability since there's no other such tool.
+- Touch %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache and make it
+ a ghost file.
+- Pass --disable-static and --with-libjasper to configure.
+- Enable parallel build.
+- Move gtk-doc documentation and gdk-pixbuf-csource to devel
+ subpackage.
+- Add a macros.gdk-pixbuf file containing useful macros for
+ packages that ship gdk-pixbuf loaders.
+
+-------------------------------------------------------------------
+Tue Jul 6 09:11:13 UTC 2010 - dimstar@xxxxxxxxxxxx
+
+- Initial package of gdk-pixbuf, which has been split out of gtk2
+ main package. For this reason it conflicts with gtk < 2.21
+- Changes from version 2.21.5:
+ + Bring back deprecated API
+ + Allow including individual headers again
+- Changes from version 2.21.4:
+ + Drop -2.0 suffix on gdk-pixbuf-csource and
+ gdk-pixbuf-query-loaders
+ + Include gdk-pixbuf-xlib again
+ + Add pixbuf tests from the GTK+ tree
+ + Add binary version and module dir as variables in the .pc file
+ + Add a boxed type for GdkPixbufFormat
+- Changes from version 2.21.3, since GTK+ 2.21.2:
+ + gdk-pixbuf has been turned back into a standalone library.
+ + The default location for loaders has been changed to
+ $libdir/gdk-pixbuf-2.0/2.10.0/loaders
+ + The default location for the module file has been changed to
+ $libdir/gdk-pixbuf-2.0/2.10.0/loaders.cache
+ and gdk-pixbuf-query-loaders-2.0 will update that file when
+ given the --update-cache option.

calling whatdependson for head-i586


New:
----
README.SUSE
baselibs.conf
gdk-pixbuf-2.21.6.tar.bz2
gdk-pixbuf.changes
gdk-pixbuf.spec
macros.gdk-pixbuf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gdk-pixbuf.spec ++++++
#
# spec file for package gdk-pixbuf (Version 2.21.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#



Name: gdk-pixbuf
Version: 2.21.6
Release: 1
License: LGPLv2+
Summary: An image loading library
Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
Source1: macros.gdk-pixbuf
Source2: README.SUSE
Source99: baselibs.conf
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(x11)

%description
gdk-pixbuf is an image loading library that can be extended by loadable
modules for new image formats. It is used by toolkits such as GTK+ or
Clutter.

%package -n libgdk_pixbuf-2_0-0
License: LGPLv2+
Summary: An image loading library
Group: System/Libraries
# Provide %{name} to make the lang package installable
Provides: %{name} = %{version}
Requires(post): gdk-pixbuf-query-loaders
Requires(postun): gdk-pixbuf-query-loaders
Recommends: %{name}-lang = %{version}
Conflicts: gtk2 < 2.21.3

%description -n libgdk_pixbuf-2_0-0
gdk-pixbuf is an image loading library that can be extended by loadable
modules for new image formats. It is used by toolkits such as GTK+ or
Clutter.

%package query-loaders
License: LGPLv2+
Summary: An image loading library - Utility to create loaders cache
Group: System/Libraries

%description query-loaders
gdk-pixbuf is an image loading library that can be extended by loadable
modules for new image formats. It is used by toolkits such as GTK+ or
Clutter.

This package contains the utility to create the cache file needed for
loadable modules.

%package devel
License: LGPLv2+
Summary: An image loading library - Development Files
Group: Development/Languages/C and C++
Requires: libgdk_pixbuf-2_0-0 = %{version}

%description devel
gdk-pixbuf is an image loading library that can be extended by loadable
modules for new image formats. It is used by toolkits such as GTK+ or
Clutter.

This package contains development files for gdk-pixbuf.

%lang_package
%prep
%setup -q
%if "%_lib" == "lib64"
cp -a %{S:2} .
%endif

%build
%configure \
--disable-static \
--enable-introspection \
--with-libjasper
%{__make} %{?_smp_mflags}

%install
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -delete -print
%find_lang %{name}
touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
%if "%_lib" == "lib64"
mv %{buildroot}%{_bindir}/gdk-pixbuf-query-loaders
%{buildroot}%{_bindir}/gdk-pixbuf-query-loaders-64
mv %{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders.1
%{buildroot}%{_mandir}/man1/gdk-pixbuf-query-loaders-64.1
%endif
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:1} %{buildroot}%{_sysconfdir}/rpm

# In case libgdk_pixbuf-2_0-0 gets installed before
# gdk-pixbuf-query-loaders, we don't want to fail. So we make the
# call to gdk-pixbuf-query-loaders dependent on the existence of
# the binary. This is why we also have a %post for
# gdk-pixbuf-query-loaders.

%post -n libgdk_pixbuf-2_0-0
/sbin/ldconfig
%if "%_lib" == "lib64"
test -f %{_bindir}/gdk-pixbuf-query-loaders-64 &&
%{_bindir}/gdk-pixbuf-query-loaders-64 --update-cache
%else
test -f %{_bindir}/gdk-pixbuf-query-loaders &&
%{_bindir}/gdk-pixbuf-query-loaders --update-cache
%endif

# If we install gdk-pixbuf-query-loaders for the first time,
# then we should run it in case libgdk_pixbuf-2_0-0 was installed
# first (ie, if %{_libdir}/gdk-pixbuf-2.0/2.10.0 already exists) which means
# gdk-pixbuf-query-loaders couldn't run there.

%post query-loaders
if [ $1 == 1 ]; then
test -d %{_libdir}/gdk-pixbuf-2.0/2.10.0
if test $? -eq 0; then
%if "%_lib" == "lib64"
%{_bindir}/gdk-pixbuf-query-loaders-64 --update-cache
%else
%{_bindir}/gdk-pixbuf-query-loaders --update-cache
%endif
fi
fi

# No need to call gdk-pixbuf-query-loaders in postun:
# - if it's an upgrade, it will have been called in post
# - if it's an uninstall, we don't care about this anymore

%postun -n libgdk_pixbuf-2_0-0 -p /sbin/ldconfig

%files -n libgdk_pixbuf-2_0-0
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
%if "%_lib" == "lib64"
%doc README.SUSE
%endif
%{_libdir}/libgdk_pixbuf-2.0.so.0*
%{_libdir}/libgdk_pixbuf_xlib-2.0.so.0*
%dir %{_libdir}/gdk-pixbuf-2.0
%dir %{_libdir}/gdk-pixbuf-2.0/2.10.0
%dir %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders
%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.so
%ghost %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
%{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib

%files query-loaders
%defattr(-, root, root)
%{_bindir}/gdk-pixbuf-query-loaders*
%{_mandir}/man1/gdk-pixbuf-query-loaders*.1*

%files devel
%defattr(-, root, root)
%{_bindir}/gdk-pixbuf-csource
%{_mandir}/man1/gdk-pixbuf-csource.1*
%{_includedir}/gdk-pixbuf-2.0
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
%{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
%doc %{_datadir}/gtk-doc/html/gdk-pixbuf
%{_sysconfdir}/rpm/macros.gdk-pixbuf

%files lang -f %{name}.lang
%changelog
++++++ README.SUSE ++++++
README for bi-architecture 64 bit platforms users
=================================================

The gdk-pixbuf loaders are different, based on the architecture of
the package. To update the cache of gdk-pixbuf loaders, run:

+ for 32 bit version: /usr/bin/gdk-pixbuf-query-loaders
+ for 64 bit version: /usr/bin/gdk-pixbuf-query-loaders-64
++++++ baselibs.conf ++++++
gdk-pixbuf-query-loaders
+/usr/bin/gdk-pixbuf-query-loaders(-64)?
post "if [ $1 == 1 ]; then test -d %{_libdir}/gdk-pixbuf-2.0/2.10.0; if test
$? -eq 0; then %{_bindir}/gdk-pixbuf-query-loaders --update-cache; fi; fi"
libgdk_pixbuf-2_0-0
provides "gdk-pixbuf-<targettype> = <version>"
post "test -f %{_bindir}/gdk-pixbuf-query-loaders &&
%{_bindir}/gdk-pixbuf-query-loaders --update-cache"
++++++ macros.gdk-pixbuf ++++++
# RPM macros for packages installing a gdk-pixbuf loader
#
###
#
# When a package installs a gdk-pixbuf loader, it should use all
# three macros:
#
# - %gdk_pixbuf_loader_requires in the preamble
# - %gdk_pixbuf_loader_post in %post
# - %gdk_pixbuf_loader_postun in %postun
#
###

%gdk_pixbuf_loader_requires \
Requires(post): gdk-pixbuf-query-loaders \
Requires(postun): gdk-pixbuf-query-loaders

# On install, update the cache
%gdk_pixbuf_loader_post \
%if "%_lib" == "lib64" \
%{_bindir}/gdk-pixbuf-query-loaders-64 --update-cache \
%else \
%{_bindir}/gdk-pixbuf-query-loaders --update-cache \
%endif

# On uninstall, update the cache. Note: we ignore upgrades (already
# handled in %post of the new package).
%gdk_pixbuf_loader_postun \
if [ $1 -eq 0 ]; then \
%if "%_lib" == "lib64" \
%{_bindir}/gdk-pixbuf-query-loaders-64 --update-cache \
%else \
%{_bindir}/gdk-pixbuf-query-loaders --update-cache \
%endif \
fi

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages