From ec38cb1e9bf0f719c0462beffd54a378a91a6218 Mon Sep 17 00:00:00 2001 From: Julian Sikorski belegdol@fedoraproject.org Date: Wed, 30 Nov 2016 21:29:34 +0100 Subject: Rebuilt and patched for libopenraw-0.1.0
- Modernised the .spec file --- raw-thumbnailer-3.0.0-libopenraw.patch | 65 ++++++++++++++++++++++++++++++++++ raw-thumbnailer.spec | 17 ++++----- 2 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 raw-thumbnailer-3.0.0-libopenraw.patch
diff --git a/raw-thumbnailer-3.0.0-libopenraw.patch b/raw-thumbnailer-3.0.0-libopenraw.patch new file mode 100644 index 0000000..5fe78d7 --- /dev/null +++ b/raw-thumbnailer-3.0.0-libopenraw.patch @@ -0,0 +1,65 @@ +diff -up raw-thumbnailer-3.0.0/configure.ac.libopenraw raw-thumbnailer-3.0.0/configure.ac +--- raw-thumbnailer-3.0.0/configure.ac.libopenraw 2016-11-30 21:07:48.631174201 +0100 ++++ raw-thumbnailer-3.0.0/configure.ac 2016-11-30 21:09:48.235108080 +0100 +@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GNOME, gdk-pixbuf-2.0 + AC_SUBST(GNOME_CFLAGS) + AC_SUBST(GNOME_LIBS) + +-PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= 0.0.9) ++PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-0.1 >= 0.0.9) + AC_SUBST(OPENRAW_CFLAGS) + AC_SUBST(OPENRAW_LIBS) + +diff -up raw-thumbnailer-3.0.0/configure.libopenraw raw-thumbnailer-3.0.0/configure +--- raw-thumbnailer-3.0.0/configure.libopenraw 2016-11-30 21:07:35.620072609 +0100 ++++ raw-thumbnailer-3.0.0/configure 2016-11-30 21:11:11.305858218 +0100 +@@ -12922,12 +12922,12 @@ if test -n "$OPENRAW_CFLAGS"; then + pkg_cv_OPENRAW_CFLAGS="$OPENRAW_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libopenraw-gnome-1.0 >= 0.0.9""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-1.0 >= 0.0.9") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.1 >= 0.0.9""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.1 >= 0.0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_OPENRAW_CFLAGS=`$PKG_CONFIG --cflags "libopenraw-gnome-1.0 >= 0.0.9" 2>/dev/null` ++ pkg_cv_OPENRAW_CFLAGS=`$PKG_CONFIG --cflags "libopenraw-gnome-0.1 >= 0.0.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -12938,12 +12938,12 @@ if test -n "$OPENRAW_LIBS"; then + pkg_cv_OPENRAW_LIBS="$OPENRAW_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libopenraw-gnome-1.0 >= 0.0.9""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-1.0 >= 0.0.9") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: $PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.1 >= 0.0.9""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.1 >= 0.0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: $? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_OPENRAW_LIBS=`$PKG_CONFIG --libs "libopenraw-gnome-1.0 >= 0.0.9" 2>/dev/null` ++ pkg_cv_OPENRAW_LIBS=`$PKG_CONFIG --libs "libopenraw-gnome-0.1 >= 0.0.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -12963,14 +12963,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- OPENRAW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenraw-gnome-1.0 >= 0.0.9" 2>&1` ++ OPENRAW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenraw-gnome-0.1 >= 0.0.9" 2>&1` + else +- OPENRAW_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenraw-gnome-1.0 >= 0.0.9" 2>&1` ++ OPENRAW_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenraw-gnome-0.1 >= 0.0.9" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OPENRAW_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (libopenraw-gnome-1.0 >= 0.0.9) were not met: ++ as_fn_error $? "Package requirements (libopenraw-gnome-0.1 >= 0.0.9) were not met: + + $OPENRAW_PKG_ERRORS + diff --git a/raw-thumbnailer.spec b/raw-thumbnailer.spec index 62153c3..3635b3f 100644 --- a/raw-thumbnailer.spec +++ b/raw-thumbnailer.spec @@ -6,27 +6,27 @@ Summary: Nautilus file manager thumbnailer for RAW images License: GPLv2+ URL: http://libopenraw.freedesktop.org/wiki/RawThumbnailer Source0: http://libopenraw.freedesktop.org/download/%%7Bname%7D-%%7Bversion%7D.tar.bz... +Patch0: %{name}-%{version}-libopenraw.patch
BuildRequires: intltool -BuildRequires: libopenraw-gnome-devel +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(libopenraw-gnome-0.1) BuildRequires: perl(XML::Parser) -BuildRequires: gtk2-devel
%description RawThumbnailer is a thumbnailer for RAW files that works with Nautilus.
%prep -%setup -q +%autosetup
%build %configure -make %{?_smp_mflags} +%make_build
%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install
%post @@ -50,8 +50,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog -* Tue Nov 29 2016 Julian Sikorski belegdol@fedoraproject.org - 3.0.0-9 -- Rebuilt for libopenraw-0.1.0 +* Wed Nov 30 2016 Julian Sikorski belegdol@fedoraproject.org - 3.0.0-9 +- Rebuilt and patched for libopenraw-0.1.0 +- Modernised the .spec file
* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 3.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
scm-commits@lists.fedoraproject.org