packages: gphoto2/gphoto2-pl.po-update.patch, gphoto2/gphoto2.spec - update...

qboosh qboosh at pld-linux.org
Wed Apr 18 18:04:20 CEST 2012 

Author: qboosh                       Date: Wed Apr 18 16:04:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.4.14
- updated pl.po-update patch
- added aalib bcond

---- Files affected:
packages/gphoto2:
   gphoto2-pl.po-update.patch (1.8 -> 1.9) , gphoto2.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: packages/gphoto2/gphoto2-pl.po-update.patch
diff -u packages/gphoto2/gphoto2-pl.po-update.patch:1.8 packages/gphoto2/gphoto2-pl.po-update.patch:1.9
--- packages/gphoto2/gphoto2-pl.po-update.patch:1.8	Wed Apr 20 20:37:39 2011
+++ packages/gphoto2/gphoto2-pl.po-update.patch	Wed Apr 18 18:04:15 2012
@@ -1,39 +1,53 @@
---- gphoto2-2.4.11/po/pl.po.orig	2011-04-17 19:42:09.000000000 +0200
-+++ gphoto2-2.4.11/po/pl.po	2011-04-20 20:31:27.819959513 +0200
+--- gphoto2-2.4.14/po/pl.po.orig	2012-04-15 18:07:56.000000000 +0200
++++ gphoto2-2.4.14/po/pl.po	2012-04-18 17:59:55.053223173 +0200
 @@ -1,14 +1,14 @@
  # Polish translation for gphoto2.
--# Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  # This file is distributed under the same license as the gphoto2 package.
--# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2010.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2011.
+-# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2011.
++# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2012.
  #
  msgid ""
  msgstr ""
--"Project-Id-Version: gphoto2 2.4.10\n"
-+"Project-Id-Version: gphoto2 2.4.11\n"
+-"Project-Id-Version: gphoto2 2.4.11\n"
++"Project-Id-Version: gphoto2 2.4.14\n"
  "Report-Msgid-Bugs-To: gphoto-devel at lists.sourceforge.net\n"
- "POT-Creation-Date: 2011-04-17 19:42+0200\n"
--"PO-Revision-Date: 2010-08-18 08:37+0200\n"
-+"PO-Revision-Date: 2011-04-19 19:24+0200\n"
+ "POT-Creation-Date: 2012-04-15 18:07+0200\n"
+-"PO-Revision-Date: 2011-04-19 19:24+0200\n"
++"PO-Revision-Date: 2012-04-17 21:09+0200\n"
  "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
  "Language: pl\n"
-@@ -777,9 +777,8 @@
- msgstr "Zapisywanie pliku jako %s\n"
+@@ -983,6 +983,9 @@
+ "Please make sure there is sufficient quoting around the arguments.\n"
+ "\n"
+ msgstr ""
++"Proszę upewnić się, że argumenty są wystarczająco zabezpieczone "
++"cudzysłowami.\n"
++"\n"
+ 
+ #: gphoto2/main.c:1684
+ msgid "Print complete help message on program usage"
+@@ -1066,9 +1069,8 @@
+ msgstr "Wypisanie drzewa konfiguracji"
  
- #: gphoto2/main.c:507
+ #: gphoto2/main.c:1731
 -#, fuzzy
- msgid "Permission denied"
--msgstr "  Uprawnienia: "
-+msgstr "Brak uprawnień"
+ msgid "Dump full configuration tree"
+-msgstr "Wypisanie drzewa konfiguracji"
++msgstr "Zrzut pełnego drzewa konfiguracji"
  
- #: gphoto2/main.c:632
- #, c-format
-@@ -1588,6 +1587,3 @@
- msgstr ""
- "Aby uzyskać pomoc dla danego polecenia, należy napisać 'help nazwa-"
- "polecenia'."
--
--#~ msgid "You cannot use '%%n' in combination with non-persistent files!"
--#~ msgstr "Nie można użyć '%%n' w połączeniu z nietrwałymi plikami!"
+ #: gphoto2/main.c:1733
+ msgid "Get configuration value"
+@@ -1225,9 +1227,8 @@
+ msgstr "Usunięcie plików z podanego przedziału"
+ 
+ #: gphoto2/main.c:1813
+-#, fuzzy
+ msgid "Delete all files in folder (--no-recurse by default)"
+-msgstr "Usunięcie wszystkich plików z folderu"
++msgstr "Usunięcie wszystkich plików z folderu (domyślnie --no-recurse)"
+ 
+ #: gphoto2/main.c:1815
+ msgid "Upload a file to camera"

================================================================
Index: packages/gphoto2/gphoto2.spec
diff -u packages/gphoto2/gphoto2.spec:1.65 packages/gphoto2/gphoto2.spec:1.66
--- packages/gphoto2/gphoto2.spec:1.65	Wed Apr 20 20:37:39 2011
+++ packages/gphoto2/gphoto2.spec	Wed Apr 18 18:04:15 2012
@@ -1,33 +1,37 @@
 # $Revision$, $Date$
+#
+# 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.11
+Version:	2.4.14
 Release:	1
 License:	LGPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5:	2635075f702b40eb2e95a80658bd4773
+# Source0-md5:	60fd6e44d89592f6172227be67227636
 Patch0:		%{name}-manpage_addon.patch
 Patch1:		%{name}-am.patch
 Patch2:		%{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.11
+BuildRequires:	libgphoto2-devel >= 2.4.14
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	readline-devel
-Requires:	libgphoto2 >= 2.4.11
+Requires:	libgphoto2 >= 2.4.14
 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
@@ -61,7 +65,8 @@
 %{__autoheader}
 %{__automake}
 CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
-%configure
+%configure \
+	%{?with_aalib:--with-aalib}
 %{__make}
 
 %install
@@ -90,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2012/04/18 16:04:15  qboosh
+- updated to 2.4.14
+- updated pl.po-update patch
+- added aalib bcond
+
 Revision 1.65  2011/04/20 18:37:39  qboosh
 - updated to 2.4.11
 - added pl.po-update patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gphoto2/gphoto2-pl.po-update.patch?r1=1.8&r2=1.9
    http://cvs.pld-linux.org/packages/gphoto2/gphoto2.spec?r1=1.65&r2=1.66

More information about the pld-cvs-commit mailing list