- updated to 2.5.4

[packages/gphoto2.git] / gphoto2.spec

diff --git a/gphoto2.spec b/gphoto2.spec
index 8f269a083dafdbc845e4736e6c4335567e44bcfc..db1a317d557f6a4c42b039a3862402388992f582 100644 (file)
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -1,32 +1,37 @@
+#
+# Conditional build:
+%bcond_without aalib   # AAlib support
+#
 Summary:       Command-line frontend to libgphoto2
 Summary(es.UTF-8):     Foto GNU (gphoto) Release 2
 Summary(pl.UTF-8):     Działający z linii poleceń program obsługujący libgphoto2
 Summary(pt_BR.UTF-8):  GNU Photo - programa GNU para câmeras digitais
 Summary(zh_CN.UTF-8):  gPhoto - Linux下的使用数码相机的程序
 Name:          gphoto2
-Version:       2.4.0
-Release:       2
-License:       GPL
+Version:       2.5.4
+Release:       1
+License:       LGPL v2+
 Group:         Applications/Graphics
-Source0:       http://dl.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5: 5fd1f711ca806adb687b33c55964d898
+Source0:       http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
+# Source0-md5: 55e062dfb09a9589b4f9d6d545724c60
 Patch0:                %{name}-manpage_addon.patch
-Patch1:                %{name}-pl.po-update.patch
-Patch2:                %{name}-am.patch
+Patch1:                automake-1.12.patch
+Patch2:                %{name}-ac.patch
+Patch3:                %{name}-pl.po-update.patch
 URL:           http://www.gphoto.org/
-BuildRequires: aalib-devel
+%{?with_aalib:BuildRequires:   aalib-devel}
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
 BuildRequires: cdk-devel >= 5.0_td20010421
 BuildRequires: gettext-devel >= 0.14.1
 BuildRequires: libexif-devel >= 0.6.9
-BuildRequires: libgphoto2-devel >= 2.4.0
+BuildRequires: libgphoto2-devel >= 2.5.4
 BuildRequires: libjpeg-devel
+BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRequires: readline-devel
-#Requires:     dcraw
-Requires:      libgphoto2 >= 2.4.0
+Requires:      libgphoto2 >= 2.5.4
 Obsoletes:     gphoto2-progs
 # these are not true (renamed to libgphoto2-{devel,static}) - we must have
 # the way to just rename package which is not required by anything installed
@@ -37,9 +42,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 gphoto2 is a command-line frontend to libgphoto2.
 
-%description -l es.UTF-8
-Foto GNU (gphoto).
-
 %description -l pl.UTF-8
 gphoto2 to działający z linii poleceń program będący interfejsem
 użytkownika do libgphoto2.
@@ -53,16 +55,19 @@ uma grande variedade de câmeras fotográficas digitais.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 %build
-CPPFLAGS="-I/usr/include/ncurses"
-%{__aclocal} -I auto-m4 -I m4m
+%{__libtoolize}
+%{__aclocal} -I m4m
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+%configure \
+       %{?with_aalib:--with-aalib}
 %{__make}
 
 %install
@@ -81,6 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/gphoto2
-%{_mandir}/man1/*
+%{_mandir}/man1/gphoto2.1*