packages: gphoto2/gphoto2.spec - gphoto2-am.patch already applied upstream ...

[kiesiu]

Author: kiesiu                       Date: Mon Jun 25 15:31:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gphoto2-am.patch already applied upstream
- use autocrap but patch configure.ac to build with automake 1.12

---- Files affected:
packages/gphoto2:
   gphoto2.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: packages/gphoto2/gphoto2.spec
diff -u packages/gphoto2/gphoto2.spec:1.68 packages/gphoto2/gphoto2.spec:1.69
--- packages/gphoto2/gphoto2.spec:1.68	Mon Jun 25 17:03:19 2012
+++ packages/gphoto2/gphoto2.spec	Mon Jun 25 17:31:10 2012
@@ -16,8 +16,8 @@
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 # Source0-md5:	60fd6e44d89592f6172227be67227636
 Patch0:		%{name}-manpage_addon.patch
-Patch1:		%{name}-am.patch
-Patch2:		%{name}-pl.po-update.patch
+Patch1:		%{name}-pl.po-update.patch
+Patch2:		automake-1.12.patch
 URL:		http://www.gphoto.org/
 %{?with_aalib:BuildRequires:	aalib-devel}
 BuildRequires:	autoconf >= 2.59
@@ -60,10 +60,10 @@
 
 %build
 %{__libtoolize}
-#%%{__aclocal} -I m4m
+%{__aclocal} -I m4m
 %{__autoconf}
 %{__autoheader}
-#%%{__automake}
+%{__automake}
 CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 %configure \
 	%{?with_aalib:--with-aalib}
@@ -95,6 +95,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2012/06/25 15:31:10  kiesiu
+- gphoto2-am.patch already applied upstream
+- use autocrap but patch configure.ac to build with automake 1.12
+
 Revision 1.68  2012/06/25 15:03:19  gotar
 - try to disable autocrap that fails
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gphoto2/gphoto2.spec?r1=1.68&r2=1.69