[packages/libgphoto2] - updated to 2.5.3.1 - removed obsolete pl.po-update patch - removed obsolete IXANY patch (_BSD_SOUR

qboosh qboosh at pld-linux.org
Sun Jan 26 17:33:24 CET 2014 

commit 1a7db9d27f894a534159600e946b1a6911d321ac
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 26 17:34:38 2014 +0100

    - updated to 2.5.3.1
    - removed obsolete pl.po-update patch
    - removed obsolete IXANY patch (_BSD_SOURCE already defined in sources)

 libgphoto2-IXANY.patch        |  10 ---
 libgphoto2-pl.po-update.patch | 144 ------------------------------------------
 libgphoto2.spec               |  28 ++++----
 3 files changed, 12 insertions(+), 170 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 4078615..84d2453 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -11,15 +11,13 @@ Summary(es.UTF-8):	Foto GNU (gphoto) Release 2
 Summary(pl.UTF-8):	Biblioteki obsługi kamer cyfrowych
 Summary(pt_BR.UTF-8):	GNU Photo - programa GNU para câmeras digitais
 Name:		libgphoto2
-Version:	2.5.2
-Release:	3
+Version:	2.5.3.1
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5:	28e0c0d449f80917fb3f79bdefbbe0ec
+# Source0-md5:	aad2607a84442769c14f6acce2ca1ddf
 Patch0:		%{name}-mode-owner-group.patch
-Patch1:		%{name}-IXANY.patch
-Patch2:		%{name}-pl.po-update.patch
 URL:		http://www.gphoto.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -27,15 +25,15 @@ BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	bison
 BuildRequires:	dbus-devel >= 0.31
 BuildRequires:	flex
-BuildRequires:	gd-devel
+BuildRequires:	gd-devel >= 2.0
 BuildRequires:	gettext-devel >= 0.14.1
 %{?with_apidocs:BuildRequires:	gtk-doc >= 0.10}
-%{?with_hal:BuildRequires:	hal-devel >= 0.5.0}
 BuildRequires:	libexif-devel >= 1:0.6.13
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libusb-devel >= 1.0.0
+BuildRequires:	libxml2-devel >= 2.0
 %{?with_baudboy:BuildRequires:	lockdev-baudboy-devel}
 %{!?with_baudboy:BuildRequires:	lockdev-devel >= 1.0.2}
 BuildRequires:	pkgconfig
@@ -74,7 +72,7 @@ Requires:	%{name} = %{version}-%{release}
 %{?with_apidocs:Requires:	gtk-doc-common}
 Requires:	libexif-devel >= 1:0.6.13
 Requires:	libltdl-devel
-Requires:	libusb-compat-devel >= 0.1
+Requires:	libusb-devel >= 1.0.0
 %{!?with_baudboy:Requires:	lockdev-devel}
 Obsoletes:	gphoto2-devel
 Obsoletes:	gphoto2-lib-devel
@@ -132,7 +130,7 @@ współpracy z aparatami podłączonymi przez port szeregowy.
 Summary:	Userspace support for digital cameras
 Summary(pl.UTF-8):	Wsparcie dla kamer cyfrowych w przestrzeni użytkownika
 Group:		Applications/System
-Requires:	libusb-compat >= 0.1
+Requires:	libusb >= 1.0.0
 %if "%{pld_release}" == "ti"
 Requires:	udev-core >= 1:124-3
 %else
@@ -168,10 +166,6 @@ w przestrzeni użytkownika.
 %prep
 %setup -q
 %patch0 -p1
-%ifarch alpha
-%patch1 -p1
-%endif
-%patch2 -p1
 
 %{__rm} po/stamp-po libgphoto2_port/po/stamp-po
 
@@ -195,7 +189,6 @@ CFLAGS="%{rpmcflags}%{?with_canonupload: -DCANON_EXPERIMENTAL_UPLOAD}"
 	--disable-ttylock \
 	%{?with_apidocs:--enable-docs} \
 	%{?with_static_libs:--enable-static} \
-	--with%{!?with_hal:out}-hal \
 	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
 	--without-libusb
 
@@ -273,11 +266,13 @@ cp --parents \
 
 # udev
 cd packaging/linux-hotplug
-install -d $RPM_BUILD_ROOT/lib/udev/rules.d
+install -d $RPM_BUILD_ROOT/lib/udev/{hwdb.d,rules.d}
 export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}
 
 ../generic/print-camera-list udev-rules version 136 group usb mode 0660 \
 	> $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
+../generic/print-camera-list hwdb \
+	> $RPM_BUILD_ROOT/lib/udev/hwdb.d/20-gphoto.hwdb
 
 %if %{with hal}
 # hal
@@ -357,7 +352,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libgphoto2_port.pc
 %{_mandir}/man3/libgphoto2.3*
 %{_mandir}/man3/libgphoto2_port.3*
-%{?with_apidocs:%{_gtkdocdir}/*}
+%{?with_apidocs:%{_gtkdocdir}/gphoto2}
 
 %if %{with static_libs}
 %files static
@@ -373,6 +368,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n udev-libgphoto2
 %defattr(644,root,root,755)
+/lib/udev/hwdb.d/20-gphoto.hwdb
 /lib/udev/rules.d/40-libgphoto2.rules
 %attr(755,root,root) /lib/udev/check-ptp-camera
 
diff --git a/libgphoto2-IXANY.patch b/libgphoto2-IXANY.patch
deleted file mode 100644
index 78d6c1c..0000000
--- a/libgphoto2-IXANY.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgphoto2-2.4.0/libgphoto2_port/serial/unix.c~	2007-07-27 02:36:13.000000000 +0200
-+++ libgphoto2-2.4.0/libgphoto2_port/serial/unix.c	2007-10-24 14:32:37.000000000 +0200
-@@ -53,6 +53,7 @@
- #endif
- 
- #ifdef HAVE_TERMIOS_H
-+#  define __USE_BSD
- #  include <termios.h>
- #  ifndef CRTSCTS
- #    define CRTSCTS  020000000000
diff --git a/libgphoto2-pl.po-update.patch b/libgphoto2-pl.po-update.patch
deleted file mode 100644
index aaebc25..0000000
--- a/libgphoto2-pl.po-update.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- libgphoto2-2.5.2/po/pl.po.orig	2013-06-10 19:50:22.182347582 +0200
-+++ libgphoto2-2.5.2/po/pl.po	2013-06-10 20:23:21.335639665 +0200
-@@ -5,10 +5,10 @@
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: libgphoto2 2.5.1\n"
-+"Project-Id-Version: libgphoto2 2.5.2\n"
- "Report-Msgid-Bugs-To: gphoto-devel at lists.sourceforge.net\n"
- "POT-Creation-Date: 2013-05-05 16:38+0200\n"
--"PO-Revision-Date: 2013-02-04 18:28+0100\n"
-+"PO-Revision-Date: 2013-06-10 19:45+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"
-@@ -216,11 +216,11 @@
- msgstr "Plik zabezpieczony."
- 
- #: camlibs/canon/canon.c:3724
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "canon_int_get_info_func: ERROR: initial message too short (%i < minimum %i)"
- msgstr ""
--"canon_int_list_directory: BŁĄD: początkowy komunikat zbyt krótki (%i < "
-+"canon_int_get_info_func: BŁĄD: początkowy komunikat zbyt krótki (%i < "
- "minimum %i)"
- 
- #: camlibs/canon/canon.c:4031
-@@ -5927,7 +5927,7 @@
- 
- #: camlibs/ptp2/config.c:4083
- msgid "Nikon autofocus drive did not focus."
--msgstr ""
-+msgstr "Napęd autofocus Nikona nie ustawił ostrości."
- 
- #: camlibs/ptp2/config.c:4188 camlibs/ptp2/config.c:4208
- msgid "Press Half"
-@@ -6111,9 +6111,8 @@
- msgstr "Prowadzenie ręczne ostrości Nikon DSLR"
- 
- #: camlibs/ptp2/config.c:5422
--#, fuzzy
- msgid "Set Nikon Control Mode"
--msgstr "Tryb flesza Nikona"
-+msgstr "Ustawienie trybu sterowania Nikona"
- 
- #: camlibs/ptp2/config.c:5423
- msgid "Drive Canon DSLR Manual focus"
-@@ -6148,9 +6147,8 @@
- msgstr "Skrypt CHDK"
- 
- #: camlibs/ptp2/config.c:5431
--#, fuzzy
- msgid "Movie Capture"
--msgstr "Zdjęcia"
-+msgstr "Nagranie filmu"
- 
- #: camlibs/ptp2/config.c:5436 camlibs/ptp2/config.c:5458
- msgid "Serial Number"
-@@ -6327,9 +6325,8 @@
- msgstr "Funkcje Własne Ex"
- 
- #: camlibs/ptp2/config.c:5501
--#, fuzzy
- msgid "Auto Power Off"
--msgstr "Automatyczne wyłączanie (w minutach)"
-+msgstr "Automatyczne wyłączanie"
- 
- #: camlibs/ptp2/config.c:5504
- msgid "Fast Filesystem"
-@@ -7568,9 +7565,9 @@
- msgstr " nie odczytano.\n"
- 
- #: camlibs/ptp2/library.c:4185
--#, fuzzy, c-format
-+#, c-format
- msgid "cannot be queried.\n"
--msgstr "Zapis na kartę niemożliwy."
-+msgstr "nie można odpytać.\n"
- 
- #: camlibs/ptp2/library.c:4257
- #, c-format
-@@ -9527,29 +9524,24 @@
- msgstr "Przetworzenie obiektu WFC"
- 
- #: camlibs/ptp2/ptp.c:5697
--#, fuzzy
- msgid "Get Partial Object (64bit Offset)"
--msgstr "Pobranie częściowego obiektu"
-+msgstr "Pobranie częściowego obiektu (offset 64-bitowy)"
- 
- #: camlibs/ptp2/ptp.c:5698
--#, fuzzy
- msgid "Send Partial Object"
--msgstr "Pobranie częściowego obiektu"
-+msgstr "Wysłanie częściowego obiektu"
- 
- #: camlibs/ptp2/ptp.c:5699
--#, fuzzy
- msgid "Truncate Object"
--msgstr "Przetworzenie obiektu WFC"
-+msgstr "Obcięcie obiektu"
- 
- #: camlibs/ptp2/ptp.c:5700
--#, fuzzy
- msgid "Begin Edit Object"
--msgstr "Wysłanie obiektu"
-+msgstr "Rozpoczęcie edycji obiektu"
- 
- #: camlibs/ptp2/ptp.c:5701
--#, fuzzy
- msgid "End Edit Object"
--msgstr "Wysłanie obiektu"
-+msgstr "Zakończenie edycji obiektu"
- 
- #: camlibs/ptp2/ptp.c:5724
- #, c-format
---- libgphoto2-2.5.2/libgphoto2_port/po/pl.po.orig	2013-06-10 19:50:22.152347584 +0200
-+++ libgphoto2-2.5.2/libgphoto2_port/po/pl.po	2013-06-10 20:23:37.468972657 +0200
-@@ -5,10 +5,10 @@
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: libgphoto2_port 2.5.1\n"
-+"Project-Id-Version: libgphoto2_port 2.5.2\n"
- "Report-Msgid-Bugs-To: gphoto-devel at lists.sourceforge.net\n"
- "POT-Creation-Date: 2013-05-05 21:31+0200\n"
--"PO-Revision-Date: 2013-02-03 21:49+0100\n"
-+"PO-Revision-Date: 2013-06-10 19:45+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"
-@@ -242,9 +242,8 @@
- msgstr "Zamykanie portu..."
- 
- #: libgphoto2_port/gphoto2-port.c:313
--#, fuzzy
- msgid "Resetting port..."
--msgstr "Zwalnianie portu..."
-+msgstr "Resetowanie portu..."
- 
- #: libgphoto2_port/gphoto2-port.c:335
- msgid "Freeing port..."
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgphoto2.git/commitdiff/1a7db9d27f894a534159600e946b1a6911d321ac

More information about the pld-cvs-commit mailing list