[rawstudio] Fix build adding missing Buildrequires and updated link patch
Gianluca Sforna
giallu at fedoraproject.org
Wed Sep 8 09:58:18 UTC 2010
commit 46de6d6e09c339b140532bc43e17e73261ee0ce3
Author: Gianluca Sforna <giallu at gmail.com>
Date: Wed Sep 8 11:57:38 2010 +0200
Fix build adding missing Buildrequires and updated link patch
.gitignore | 1 -
rawstudio-1.2-link_libX11.patch | 13 +++++++++++++
rawstudio.spec | 12 +++++++++++-
3 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2382f04..4d8b58e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
rawstudio-1.2.tar.gz
-rawstudio-1.2-link_libX11.patch
/rawstudio.tar.gz
diff --git a/rawstudio-1.2-link_libX11.patch b/rawstudio-1.2-link_libX11.patch
new file mode 100644
index 0000000..d114952
--- /dev/null
+++ b/rawstudio-1.2-link_libX11.patch
@@ -0,0 +1,13 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 3521)
++++ configure.in (working copy)
+@@ -83,7 +83,7 @@
+ fi
+ AC_SUBST(LIBTIFF)
+
+-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl"
++pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl x11"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
diff --git a/rawstudio.spec b/rawstudio.spec
index 7bd6893..7643817 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -16,8 +16,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, libxml2-devel, GConf2-devel, dbus-devel
BuildRequires: lcms-devel, libjpeg-devel, libtiff-devel, exiv2-devel
+BuildRequires: flickcurl-devel, lensfun-devel, fftw-devel, libcurl-devel
+BuildRequires: sqlite-devel, openssl-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
+BuildRequires: libtool
+
+# http://bugzilla.rawstudio.org/show_bug.cgi?id=417
+Patch0: rawstudio-1.2-link_libX11.patch
%description
@@ -35,7 +41,7 @@ JPEG, PNG or TIF format images from most digital cameras.
%prep
%setup -q -n rawstudio
-
+%patch0 -p0
%build
./autogen.sh
@@ -92,6 +98,10 @@ update-desktop-database &> /dev/null ||:
%{_libdir}/pkgconfig/rawstudio-1.1.pc
%changelog
+* Tue Sep 8 2010 Gianluca Sforna <giallu gmail com>
+- Fix BuildRequires
+- Add updated patch for X11 link issue
+
* Tue Sep 7 2010 Gianluca Sforna <giallu gmail com>
- move to a snapshot
- drop upstreamed patches
More information about the scm-commits
mailing list