[packages/rawstudio] - fix building with automake 1.13 - fix autotools regen - rel 6

baggins baggins at pld-linux.org
Thu Jun 13 10:22:24 CEST 2013


commit 5e4479dde7b7bb5f2fefef916d771342535b005a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jun 13 10:22:04 2013 +0200

    - fix building with automake 1.13
    - fix autotools regen
    - rel 6

 am.patch       | 19 +++++++++++++++++++
 rawstudio.spec | 11 +++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/rawstudio.spec b/rawstudio.spec
index 4571fc1..c54453e 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -2,7 +2,7 @@ Summary:	RAW-image converter written using GTK+
 Summary(pl.UTF-8):	Konwerter obrazów RAW napisany z użyciem GTK+
 Name:		rawstudio
 Version:	2.0
-%define	_rel	5
+%define	_rel	6
 # Keep it for future snapshots because releases are not-so-frequent:
 %define	_svnrev		1624
 %define	_snapday	20080130
@@ -16,6 +16,7 @@ Group:		X11/Applications/Graphics
 Source0:	http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
 # Source0-md5:	b2f86b8ca6b83ad954e3104c4cb89e9b
 Patch0:		%{name}-libpng15.patch
+Patch1:		am.patch
 URL:		http://rawstudio.org/
 BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	autoconf
@@ -26,6 +27,7 @@ BuildRequires:	flickcurl-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	lcms-devel
+BuildRequires:	lensfun-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libxml2-devel >= 2.4
@@ -51,9 +53,14 @@ Header files for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-./autogen.sh
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 %{__make}
 
diff --git a/am.patch b/am.patch
new file mode 100644
index 0000000..a8d5132
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,19 @@
+--- rawstudio-2.0/configure.in~	2013-06-13 10:08:20.678617824 +0200
++++ rawstudio-2.0/configure.in	2013-06-13 10:08:39.662157989 +0200
+@@ -2,7 +2,7 @@
+ 
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(rawstudio, 2.0)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ AM_PROG_LIBTOOL
+ AC_CONFIG_MACRO_DIR([m4])
+@@ -9,7 +9,6 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_CXX
+ AC_HEADER_STDC
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rawstudio.git/commitdiff/5e4479dde7b7bb5f2fefef916d771342535b005a



More information about the pld-cvs-commit mailing list