Updated to 0.1.0
- Dropped upstreamed patches - Cleaned up and modernised the .spec file
This commit is contained in:
Julian Sikorski
parent
2ad608ffb6
commit
5ef8d213e8
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
libopenraw-0.0.8.tar.gz
|
||||
/libopenraw-0.0.9.tar.bz2
|
||||
/libopenraw-0.1.0.tar.bz2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1279152
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=93712
|
||||
https://cgit.freedesktop.org/libopenraw/commit/?id=f19e73b
|
||||
|
||||
--- a/gnome/pixbuf-loader.c
|
||||
+++ b/gnome/pixbuf-loader.c
|
||||
@@ -98,7 +98,6 @@ gdk_pixbuf__or_image_stop_load (gpointer
|
||||
|
||||
GdkPixbuf *pixbuf = NULL;
|
||||
ORRawFileRef raw_file = NULL;
|
||||
- (void)error;
|
||||
|
||||
raw_file = or_rawfile_new_from_memory(context->data->data, context->data->len,
|
||||
OR_DATA_TYPE_NONE);
|
||||
@@ -129,6 +128,11 @@ gdk_pixbuf__or_image_stop_load (gpointer
|
||||
context->user_data);
|
||||
}
|
||||
result = TRUE;
|
||||
+ } else {
|
||||
+ g_set_error (error,
|
||||
+ GDK_PIXBUF_ERROR,
|
||||
+ GDK_PIXBUF_ERROR_FAILED,
|
||||
+ "Unable to load RAW file");
|
||||
}
|
||||
|
||||
|
||||
@ -1,20 +1,17 @@
|
||||
Summary: Decode camera RAW files
|
||||
Name: libopenraw
|
||||
Version: 0.0.9
|
||||
Release: 18%{?dist}
|
||||
Version: 0.1.0
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv3+
|
||||
URL: http://libopenraw.freedesktop.org/wiki
|
||||
Source0: http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1279152
|
||||
Patch0: libopenraw-bz1279152.patch
|
||||
|
||||
BuildRequires: libtool autoconf automake
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: exempi-devel >= 1.99.5
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
BuildRequires: pkgconfig(libxml-2.0) >= 2.5.0
|
||||
|
||||
%description
|
||||
libopenraw is an ongoing project to provide a free software
|
||||
@ -25,17 +22,14 @@ image processing application.
|
||||
|
||||
%package gnome
|
||||
Summary: GUI components of %{name}
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description gnome
|
||||
The %{name}-gnome package contains gui components of %{name}.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
@ -43,10 +37,8 @@ developing applications that use %{name}.
|
||||
|
||||
%package gnome-devel
|
||||
Summary: Development files for %{name}-gnome
|
||||
|
||||
Requires: %{name}-gnome = %{version}-%{release}
|
||||
Requires: %{name}-devel = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Requires: %{name}%{?_isa}-gnome = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa}-devel = %{version}-%{release}
|
||||
|
||||
%description gnome-devel
|
||||
The %{name}-gnome-devel package contains libraries and header files for
|
||||
@ -56,7 +48,7 @@ developing applications that use %{name}-gnome.
|
||||
Summary: RAW image loader for GTK+ applications
|
||||
|
||||
Requires: gtk2
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires(post): gdk-pixbuf2
|
||||
Requires(postun): gdk-pixbuf2
|
||||
|
||||
@ -65,24 +57,21 @@ Requires(postun): gdk-pixbuf2
|
||||
digital cameras, in GTK+ applications.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%configure --disable-static --enable-gnome
|
||||
%configure --disable-static --enable-gnome --disable-silent-rules
|
||||
|
||||
# Omit unused direct shared library dependencies.
|
||||
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%{make_build}
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@ -114,22 +103,27 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
|
||||
|
||||
%files devel
|
||||
%{_libdir}/%{name}.so
|
||||
%{_libdir}/pkgconfig/%{name}-1.0.pc
|
||||
%{_libdir}/pkgconfig/%{name}-0.1.pc
|
||||
|
||||
%dir %{_includedir}/%{name}-1.0
|
||||
%{_includedir}/%{name}-1.0/%{name}/*.h
|
||||
%dir %{_includedir}/%{name}-0.1
|
||||
%{_includedir}/%{name}-0.1/%{name}/*.h
|
||||
|
||||
%files gnome-devel
|
||||
%{_libdir}/%{name}gnome.so
|
||||
%{_libdir}/pkgconfig/%{name}-gnome-1.0.pc
|
||||
%{_libdir}/pkgconfig/%{name}-gnome-0.1.pc
|
||||
|
||||
%dir %{_includedir}/%{name}-1.0/%{name}-gnome
|
||||
%{_includedir}/%{name}-1.0/%{name}-gnome/gdkpixbuf.h
|
||||
%dir %{_includedir}/%{name}-0.1/%{name}-gnome
|
||||
%{_includedir}/%{name}-0.1/%{name}-gnome/gdkpixbuf.h
|
||||
|
||||
%files pixbuf-loader
|
||||
%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so
|
||||
|
||||
%changelog
|
||||
* Tue Nov 29 2016 Julian Sikorski <belegdol@fedoraproject.org> - 0.1.0-1
|
||||
- Updated to 0.1.0
|
||||
- Dropped upstreamed patches
|
||||
- Cleaned up and modernised the .spec file
|
||||
|
||||
* Wed Jun 29 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.0.9-18
|
||||
- Fix crash in GdkPixbuf loader (#1279152)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user