commit 345a93b709e38b8ceab84821e7df21d309bc2920 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Tue Apr 5 20:18:04 2022 +0200
- updated to 2.5.28 - updated pl.po-update patch from TP - removed obsolete automake-1.12,ac,cdk patches - dropped manpage_addon patch automake-1.12.patch | 12 ----- gphoto2-ac.patch | 10 ---- gphoto2-cdk.patch | 37 -------------- gphoto2-manpage_addon.patch | 10 ---- gphoto2-pl.po-update.patch | 117 +++++++++++++++++++++++++++++++++++--------- gphoto2.spec | 25 ++++------ 6 files changed, 104 insertions(+), 107 deletions(-) --- diff --git a/gphoto2.spec b/gphoto2.spec index d75b968..c477200 100644 --- a/gphoto2.spec +++ b/gphoto2.spec @@ -8,17 +8,13 @@ Summary(pl.UTF-8): Działający z linii poleceń program obsługujący libgphoto Summary(pt_BR.UTF-8): GNU Photo - programa GNU para câmeras digitais Summary(zh_CN.UTF-8): gPhoto - Linux下的使用数码相机的程序 Name: gphoto2 -Version: 2.5.23 -Release: 3 +Version: 2.5.28 +Release: 1 License: LGPL v2+ Group: Applications/Graphics Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2 -# Source0-md5: 0abd5ae8315109ae66bf06ac37902678 -Patch0: %{name}-manpage_addon.patch -Patch1: automake-1.12.patch -Patch2: %{name}-ac.patch -Patch3: %{name}-cdk.patch -Patch4: %{name}-pl.po-update.patch +# Source0-md5: e7b3c835c26e2a5e61cf0b95e19da507 +Patch0: %{name}-pl.po-update.patch URL: http://www.gphoto.org/ %{?with_aalib:BuildRequires: aalib-devel} BuildRequires: autoconf >= 2.59 @@ -30,15 +26,16 @@ BuildRequires: libgphoto2-devel >= 2.5.17 BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: popt-devel +BuildRequires: popt-devel >= 1.6.1 BuildRequires: readline-devel Requires: libexif >= 1:0.6.9 Requires: libgphoto2 >= 2.5.17 -Obsoletes: gphoto2-progs +Requires: popt >= 1.6.1 +Obsoletes: gphoto2-progs < 2.1.1 # 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 -Obsoletes: gphoto2-devel -Obsoletes: gphoto2-static +Obsoletes: gphoto2-devel < 2.1.1 +Obsoletes: gphoto2-static < 2.1.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -55,10 +52,6 @@ uma grande variedade de câmeras fotográficas digitais. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %{__rm} po/stamp-po diff --git a/automake-1.12.patch b/automake-1.12.patch deleted file mode 100644 index 61ac112..0000000 --- a/automake-1.12.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr gphoto2-2.4.14.orig/configure.ac gphoto2-2.4.14/configure.ac ---- gphoto2-2.4.14.orig/configure.ac 2012-04-15 18:05:54.000000000 +0200 -+++ gphoto2-2.4.14/configure.ac 2012-06-25 17:25:10.283187148 +0200 -@@ -5,7 +5,7 @@ - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_MACRO_DIR([auto-m4]) - AC_CONFIG_AUX_DIR([auto-aux]) --AM_INIT_AUTOMAKE([-Wall -Werror gnu 1.9 dist-bzip2 check-news]) -+AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news]) - - if test ! -d "$srcdir/m4m"; then - AC_MSG_ERROR([ diff --git a/gphoto2-ac.patch b/gphoto2-ac.patch deleted file mode 100644 index bfd0ed1..0000000 --- a/gphoto2-ac.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gphoto2-2.5.1/configure.ac.orig 2013-02-04 20:13:13.848671318 +0100 -+++ gphoto2-2.5.1/configure.ac 2013-02-04 20:17:20.538666176 +0100 -@@ -66,7 +66,6 @@ - ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" - AM_GNU_GETTEXT_VERSION([0.14.1]) - AM_GNU_GETTEXT([external]) --AM_PO_SUBDIRS() - AM_ICONV() - GP_GETTEXT_FLAGS() - diff --git a/gphoto2-cdk.patch b/gphoto2-cdk.patch deleted file mode 100644 index f65dd8e..0000000 --- a/gphoto2-cdk.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- gphoto2-2.5.14/configure.ac.orig 2017-07-19 17:05:04.747246216 +0200 -+++ gphoto2-2.5.14/configure.ac 2017-07-19 17:24:56.143899271 +0200 -@@ -141,8 +141,8 @@ - if $try_cdk; then - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="-I$cdk_prefix/include $CPPFLAGS" -- AC_CHECK_HEADER([cdk/cdk.h], [ -- have_cdk=: -+ AC_CHECK_HEADERS([cdk/cdk.h cdk.h], [have_cdk=:]) -+ if $have_cdk; then - AC_PATH_PROG([CDK_CONFIG], [cdk5-config]) - if test -n "${CDK_CONFIG}"; then - CDK_CFLAGS=`$CDK_CONFIG --cflags` -@@ -160,7 +160,7 @@ - cdk_msg="yes (but without fscale)" - ]) - LDFLAGS="$LDFLAGS_save" -- ]) -+ fi - CPPFLAGS="$CPPFLAGS_save" - fi - AM_CONDITIONAL([HAVE_CDK], [$have_cdk]) ---- gphoto2-2.5.14/gphoto2/gphoto2-cmd-config.c.orig 2015-08-01 13:20:27.000000000 +0200 -+++ gphoto2-2.5.14/gphoto2/gphoto2-cmd-config.c 2017-07-19 16:49:28.570590242 +0200 -@@ -29,7 +29,12 @@ - - #include <gphoto2/gphoto2-widget.h> - -+#ifdef HAVE_CDK_H -+#include <cdk.h> -+#elif defined(HAVE_CDK_CDK_H) - #include <cdk/cdk.h> -+#endif -+ - - #ifndef MAX - # define MAX(a, b) ((a) > (b) ? (a) : (b)) diff --git a/gphoto2-manpage_addon.patch b/gphoto2-manpage_addon.patch deleted file mode 100644 index 58af933..0000000 --- a/gphoto2-manpage_addon.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gphoto2-2.5.8/doc/gphoto2.1.orig 2015-07-09 15:55:34.483243879 +0200 -+++ gphoto2-2.5.8/doc/gphoto2.1 2015-07-09 19:13:58.056077673 +0200 -@@ -828,6 +828,7 @@ - .RE - .SH "SEE ALSO" - .PP -+dcraw(1), - libgphoto2(3), - \m[blue]\fBThe gPhoto2 Manual\fR\m[]\&\s-2\u[1]\d\s+2, - \m[blue]\fBThe gphoto\&.org website\fR\m[]\&\s-2\u[2]\d\s+2, diff --git a/gphoto2-pl.po-update.patch b/gphoto2-pl.po-update.patch index c64e69d..0e7cd04 100644 --- a/gphoto2-pl.po-update.patch +++ b/gphoto2-pl.po-update.patch @@ -1,40 +1,48 @@ ---- gphoto2-2.5.23/po/pl.po.orig 2019-06-02 13:56:34.000000000 +0200 -+++ gphoto2-2.5.23/po/pl.po 2019-06-05 20:41:36.623277712 +0200 -@@ -5,10 +5,10 @@ +--- gphoto2-2.5.28/po/pl.po.orig 2022-01-03 12:23:06.000000000 +0100 ++++ gphoto2-2.5.28/po/pl.po 2022-04-05 20:12:31.489295569 +0200 +@@ -1,14 +1,14 @@ + # Polish translation for gphoto2. +-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. ++# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2021 Free Software Foundation, Inc. + # This file is distributed under the same license as the gphoto2 package. +-# Jakub Bogusz <qbo...@pld-linux.org>, 2006-2015. ++# Jakub Bogusz <qbo...@pld-linux.org>, 2006-2021. # msgid "" msgstr "" -"Project-Id-Version: gphoto2 2.5.9\n" -+"Project-Id-Version: gphoto2 2.5.23\n" ++"Project-Id-Version: gphoto2 2.5.28\n" "Report-Msgid-Bugs-To: gphoto-de...@lists.sourceforge.net\n" - "POT-Creation-Date: 2019-06-02 13:56+0200\n" + "POT-Creation-Date: 2022-01-03 12:21+0100\n" -"PO-Revision-Date: 2015-11-19 18:00+0100\n" -+"PO-Revision-Date: 2019-06-05 20:31+0200\n" ++"PO-Revision-Date: 2022-01-04 21:08+0100\n" "Last-Translator: Jakub Bogusz <qbo...@pld-linux.org>\n" "Language-Team: Polish <translation-team...@lists.sourceforge.net>\n" "Language: pl\n" -@@ -369,7 +369,7 @@ - msgstr "Port OS/2 wykonał Bart van Leeuwen\n" +@@ -365,7 +365,7 @@ msgid "You can only specify speeds for s + msgstr "Można podać prędkości tylko dla portów szeregowych." - #: gphoto2/actions.c:908 + #: gphoto2/actions.c:921 -#, fuzzy, c-format +#, c-format msgid "" "gphoto2 %s\n" "\n" -@@ -385,7 +385,7 @@ +@@ -381,8 +381,8 @@ msgid "" msgstr "" "gphoto2 %s\n" "\n" -"Copyright (c) 2000-%d Lutz Mueller i inni\n" -+"Copyright (c) 2000-%d Marcus Meisser i inni\n" - "%s\n" +-"%s\n" ++"Copyright (c) 2000-%d Marcus Meissner i inni\n" ++"\n" "gphoto2 jest udostępniony BEZ ŻADNEJ GWARANCJI do granic dopuszczalnych\n" "przez prawo. Można rozprowadzać kopie gphoto2 na warunkach Powszechnej\n" -@@ -469,10 +469,10 @@ + "Licencji Publicznej GNU (GNU General Public License). Więcej informacji\n" +@@ -465,21 +465,21 @@ msgstr "" "Oczekiwanie na %d zdarzeń z aparatu. Aby przerwać, proszę nacisnąć Ctrl-C.\n" - #: gphoto2/actions.c:1134 + #: gphoto2/actions.c:1154 -#, fuzzy, c-format +#, c-format msgid "Waiting for '%s' event from camera. Press Ctrl-C to abort.\n" @@ -43,34 +51,99 @@ +"Oczekiwanie na zdarzenie '%s' z aparatu. Aby przerwać, proszę nacisnąć Ctrl-" "C.\n" - #: gphoto2/actions.c:1178 gphoto2/actions.c:1192 gphoto2/actions.c:1208 -@@ -871,9 +871,9 @@ + #: gphoto2/actions.c:1169 + #, c-format + msgid "SIGUSR1 signal received, triggering capture!\n" +-msgstr "" ++msgstr "Odebrano sygnał SIGUSR1, wyzwalanie zdjęcia!\n" + + #: gphoto2/actions.c:1180 +-#, fuzzy, c-format ++#, c-format + msgid "SIGUSR2 signal received, stopping wait!\n" +-msgstr "napotkano zdarzenie, kończenie oczekiwania!\n" ++msgstr "Odebrano sygnał SIGUSR2, kończenie oczekiwania!\n" + + #: gphoto2/actions.c:1218 gphoto2/actions.c:1229 gphoto2/actions.c:1236 + #: gphoto2/actions.c:1252 gphoto2/actions.c:1290 gphoto2/actions.c:1298 +@@ -878,9 +878,9 @@ msgid "Event FOLDER_ADDED %s/%s during w msgstr "Zdarzenie FOLDER_ADDED %s/%s w trakcie oczekiwania, zignorowano.\n" - #: gphoto2/main.c:915 + #: gphoto2/main.c:917 -#, fuzzy, c-format +#, c-format msgid "Event FILE_CHANGED %s/%s during wait, ignoring.\n" -msgstr "Zdarzenie FOLDER_ADDED %s/%s w trakcie oczekiwania, zignorowano.\n" +msgstr "Zdarzenie FILE_CHANGED %s/%s w trakcie oczekiwania, zignorowano.\n" - #: gphoto2/main.c:925 + #: gphoto2/main.c:927 + #, c-format +@@ -1086,7 +1086,7 @@ msgstr "Ciche wyjście (domyślnie=szcze + + #: gphoto2/main.c:1997 + msgid "Simple parsable output (implies quiet)" +-msgstr "" ++msgstr "Proste wyjście do analizy (implikuje ciche wyjście)" + + #: gphoto2/main.c:1999 + msgid "Hook script to call after downloads, captures, etc." +@@ -1186,7 +1186,7 @@ msgstr "Oczekiwanie na zdarzenia z apara + + #: gphoto2/main.c:2058 gphoto2/main.c:2060 gphoto2/main.c:2086 + msgid "EVENT" +-msgstr "" ++msgstr "ZDARZENIE" + + #: gphoto2/main.c:2060 + msgid "Wait for event(s) from the camera and download new images" +@@ -1349,10 +1349,11 @@ msgstr "WZORZEC_PLIKU" #, c-format -@@ -1587,9 +1587,8 @@ + msgid "Specify the number a filename %%n will starts with (default 1)" + msgstr "" ++"Określenie numeru, od którego zacznie się nazwa pliku %%n (domyślnie 1)" + + #: gphoto2/main.c:2137 + msgid "NUMBER" +-msgstr "" ++msgstr "NUMER" + + #: gphoto2/main.c:2139 + msgid "Specify camera folder (default=\"/\")" +@@ -1452,14 +1453,13 @@ msgid "Downloading, uploading and manipu + msgstr "Ściąganie, wysyłanie i obróbka plików" + + #: gphoto2/main.c:2249 +-#, fuzzy + msgid "EVENT can be either COUNT, SECONDS, MILLISECONDS, or MATCHSTRING.\n" +-msgstr "COUNT, SECONDS, MILLISECONDS lub MATCHSTRING" ++msgstr "ZDARZENIEM może być COUNT, SECONDS, MILLISECONDS lub MATCHSTRING.\n" + + #: gphoto2/main.c:2412 gphoto2/main.c:2461 + #, c-format + msgid "Port %s not found\n" +-msgstr "" ++msgstr "Nie znaleziono portu %s\n" + + #: gphoto2/range.c:107 gphoto2/range.c:161 + #, c-format +@@ -1617,9 +1617,8 @@ msgid "name=valueindex" msgstr "nazwa=numer_wartości" - #: gphoto2/shell.c:155 + #: gphoto2/shell.c:157 -#, fuzzy msgid "Triggers the capture of a single image" -msgstr "Wyzwolenie zrobienia zdjęcia" +msgstr "Wyzwolenie zrobienia pojedynczego zdjęcia" - #: gphoto2/shell.c:156 + #: gphoto2/shell.c:158 msgid "Capture a single image" -@@ -1702,6 +1701,3 @@ +@@ -1732,9 +1731,3 @@ msgid "To get help on a particular comma msgstr "" "Aby uzyskać pomoc dla danego polecenia, należy napisać 'help nazwa-" "polecenia'." - +-#~ msgid "OS/2 port by Bart van Leeuwen\n" +-#~ msgstr "Port OS/2 wykonał Bart van Leeuwen\n" +- -#~ msgid "Trigger image capture" -#~ msgstr "Wyzwolenie zrobienia zdjęcia" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gphoto2.git/commitdiff/345a93b709e38b8ceab84821e7df21d309bc2920 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit