- updated to 2.5.19

[packages/libgphoto2.git] / libgphoto2.spec

diff --git a/libgphoto2.spec b/libgphoto2.spec
index 7798644b0d191cbb11f0db683d959245b9315d65..3739836f3d28c26a0f6806b51a90ac18396eeea7 100644 (file)
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -3,43 +3,52 @@
 %bcond_with    apidocs         # API documentation (currently broken)
 %bcond_without baudboy         # use lockdev library instead of baudboy
 %bcond_with    canonupload     # Canon upload experimental code
+%bcond_with    hal             # build HAL support
 %bcond_without static_libs     # static libraries
-#
+
 Summary:       Libraries for digital cameras
 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.4.10.1
-Release:       3
+Version:       2.5.19
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5: 362cd914c64b2363f4d0bd5ad07c7209
+# Source0-md5: ca9574e2a749de66018a077bd24aa86f
 Patch0:                %{name}-mode-owner-group.patch
-Patch1:                %{name}-IXANY.patch
-Patch2:                %{name}-increase_max_entries.patch
+# if there are fuzzy/missing entries in file, check for updated version:
+# po/pl.po: https://translationproject.org/PO-files/pl/libgphoto2-%{version}.pl.po
+# libgphoto2_port/po/pl.po: https://translationproject.org/PO-files/pl/libgphoto2_port-%{version}.pl.po
+# and pass through msgcat to get shorter diff
+Patch1:                %{name}-pl.po-update.patch
+# from FC
+Patch2:                gphoto2-device-return.patch
 URL:           http://www.gphoto.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
 BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: bison
 BuildRequires: dbus-devel >= 0.31
-BuildRequires: gd-devel
-BuildRequires: gettext-devel >= 0.14.1
+BuildRequires: flex
+BuildRequires: gd-devel >= 2.1
+BuildRequires: gettext-tools >= 0.14.1
 %{?with_apidocs:BuildRequires: gtk-doc >= 0.10}
-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-compat-devel >= 0.1
+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
+BuildRequires: rpmbuild(macros) >= 1.691
 BuildRequires: sed >= 4.0
 Requires:      libexif >= 1:0.6.13
-Provides:      gphoto2-lib
-Obsoletes:     gphoto2-lib
+Provides:      gphoto2-lib = %{version}-%{release}
+Obsoletes:     gphoto2-lib < 2.1.1
 Conflicts:     gphoto2 < 2.1.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,7 +80,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
@@ -129,7 +138,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
@@ -137,6 +146,7 @@ Requires:   udev-core >= 1:136
 %endif
 Provides:      udev-digicam
 Obsoletes:     hal-gphoto
+%{!?with_hal:Obsoletes:        hal-libgphoto2}
 Obsoletes:     hotplug-digicam
 Obsoletes:     udev-digicam
 
@@ -164,9 +174,7 @@ 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
@@ -174,12 +182,12 @@ w przestrzeni użytkownika.
 %build
 # supplied libtool is broken (relink)
 %{__libtoolize}
-%{__aclocal} -I auto-m4 -I m4m
+%{__aclocal} -I auto-m4 -I gphoto-m4
 %{__autoconf}
 %{__automake}
 cd libgphoto2_port
 %{__libtoolize}
-%{__aclocal} -I auto-m4 -I m4
+%{__aclocal} -I auto-m4 -I gphoto-m4
 %{__autoconf}
 %{__automake}
 cd ..
@@ -191,7 +199,8 @@ CFLAGS="%{rpmcflags}%{?with_canonupload: -DCANON_EXPERIMENTAL_UPLOAD}"
        --disable-ttylock \
        %{?with_apidocs:--enable-docs} \
        %{?with_static_libs:--enable-static} \
-       %{?with_apidocs:--with-html-dir=%{_gtkdocdir}}
+       %{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
+       --without-libusb
 
 %{__make}
 
@@ -263,29 +272,33 @@ cp --parents \
        camlibs/topfield/ChangeLog \
        camlibs/toshiba/pdrm11/README.toshiba-pdrm11 \
        libgphoto2_port/{AUTHORS,ChangeLog,NEWS,README} \
-       libgphoto2_port/disk/ChangeLog \
        docs
 
 # 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
 install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty
 
 ../generic/print-camera-list hal-fdi | \
        grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+%endif
 
 %if %{with static_libs}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgphoto2/*/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgphoto2_port/*/*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgphoto2/*/*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgphoto2_port/*/*.a
 %endif
 # kill unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libgphoto{2,2_port}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/libgphoto{2,2_port}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgphoto2_port/*/vcamera/README.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -293,6 +306,12 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
+%post -n udev-libgphoto2
+%udev_hwdb_update
+
+%postun -n udev-libgphoto2
+%udev_hwdb_update
+
 %post -n hal-libgphoto2
 %service -q haldaemon restart
 
@@ -300,9 +319,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README TESTERS docs/*
 %attr(755,root,root) %{_libdir}/libgphoto2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgphoto2.so.2
+%attr(755,root,root) %ghost %{_libdir}/libgphoto2.so.6
 %attr(755,root,root) %{_libdir}/libgphoto2_port.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgphoto2_port.so.0
+%attr(755,root,root) %ghost %{_libdir}/libgphoto2_port.so.12
 
 # camera plugins
 %dir %{_libdir}/libgphoto2
@@ -315,12 +334,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/libgphoto2_port/*
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/disk.so
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/ptpip.so
-%attr(755,root,root) %{_libdir}/libgphoto2_port/*/usb.so
+%attr(755,root,root) %{_libdir}/libgphoto2_port/*/usb1.so
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/usbdiskdirect.so
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/usbscsi.so
 %{_libdir}/libgphoto2_port/*/disk.la
 %{_libdir}/libgphoto2_port/*/ptpip.la
-%{_libdir}/libgphoto2_port/*/usb.la
+%{_libdir}/libgphoto2_port/*/usb1.la
 %{_libdir}/libgphoto2_port/*/usbdiskdirect.la
 %{_libdir}/libgphoto2_port/*/usbscsi.la
 
@@ -350,7 +369,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
@@ -366,10 +385,12 @@ 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-mtp-device
 %attr(755,root,root) /lib/udev/check-ptp-camera
 
+%if %{with hal}
 %files -n hal-libgphoto2
 %defattr(644,root,root,755)
 %{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+%endif