- fix %post and %postun scripts and install directory for

pixbuf-loader
This commit is contained in:
Christian Krause 2010-10-24 23:46:00 +02:00
parent c2cdb457eb
commit 0546fce1cc
2 changed files with 29 additions and 8 deletions

View File

@ -0,0 +1,14 @@
diff -uNr libopenraw-0.0.8.old/configure.in libopenraw-0.0.8/configure.in
--- libopenraw-0.0.8.old/configure.in 2009-05-15 22:21:53.000000000 +0200
+++ libopenraw-0.0.8/configure.in 2010-10-24 23:20:03.000000000 +0200
@@ -135,8 +135,8 @@
if test x$HAVE_LIBGLIB = xyes ; then
PKG_CHECK_MODULES(LIBGDKPIXBUF, gdk-pixbuf-2.0 >= $LIBGDKPIXBUF_REQUIRED,
[AC_DEFINE(HAVE_LIBGDKPIXBUF, 1, [Define to 1 to enable libgdkpixbuf support])
- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
+ GDK_PIXBUF_VERSION=`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`
+ GDK_PIXBUF_DIR="gdk-pixbuf-2.0/$GDK_PIXBUF_VERSION/loaders"
AC_SUBST(GDK_PIXBUF_DIR)
HAVE_LIBGDKPIXBUF=yes],
[HAVE_LIBGDKPIXBUF=no])

View File

@ -1,7 +1,7 @@
Summary: Decode camera RAW files
Name: libopenraw
Version: 0.0.8
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv3+
Group: System Environment/Libraries
URL: http://libopenraw.freedesktop.org/wiki
@ -13,6 +13,8 @@ Patch0: 0001-Support-partially-PEF-from-Pentax-K20D.patch
# properly decompress CFA from certain cameras (patch slightly modified
# to omit patching README)
Patch1: 0001-Properly-decompress-CFA-from-Canon-7D-5DMkII-500D-1D.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=31088
Patch2: libopenraw-0.0.8-pixbufloaderdir.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -68,8 +70,8 @@ Group: System Environment/Libraries
Requires: gtk2
Requires: %{name} = %{version}-%{release}
Requires(post): gtk2
Requires(postun): gtk2
Requires(post): gdk-pixbuf2
Requires(postun): gdk-pixbuf2
%description pixbuf-loader
%{name}-pixbuf-loader contains a plugin to load RAW images, as created by
@ -79,8 +81,10 @@ digital cameras, in GTK+ applications.
%setup -q
%patch1 -p1 -b CFA-decrompress-fix
%patch0 -p1 -b pef-crash-fix
%patch2 -p1 -b pixbufloaderdir
%build
autoreconf -i -f
%configure --disable-static --enable-gnome
# Omit unused direct shared library dependencies.
@ -109,12 +113,11 @@ rm -rf $RPM_BUILD_ROOT
%postun gnome -p /sbin/ldconfig
%post pixbuf-loader
/usr/bin/update-gdk-pixbuf-loaders %{_target_platform}
gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
%postun pixbuf-loader
if [ $1 = 0 ]; then
/usr/bin/update-gdk-pixbuf-loaders %{_target_platform}
fi
gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
%files
%defattr(-,root,root,-)
@ -148,9 +151,13 @@ fi
%files pixbuf-loader
%defattr(-,root,root,-)
%{_libdir}/gtk-2.0/2.10.0/loaders/%{name}_pixbuf.so
%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so
%changelog
* Sun Oct 24 2010 Christian Krause <chkr@fedoraproject.org> - 0.0.8-4
- fix %%post and %%postun scripts and install directory for
pixbuf-loader
* Sun Oct 24 2010 Christian Krause <chkr@fedoraproject.org> - 0.0.8-3
- add upstream patch 22287584fbfa4657098ee997957a6c4fc972a53b to
properly decompress CFA from certain cameras (BZ 624283)