|
@@ -1,8 +1,8 @@
|
|
Summary: Library for accessing digital cameras
|
|
Summary: Library for accessing digital cameras
|
|
Summary(ja): デジタルカメラにアクセスするためのライブラリ
|
|
Summary(ja): デジタルカメラにアクセスするためのライブラリ
|
|
Name: libgphoto2
|
|
Name: libgphoto2
|
|
-Version: 2.5.0
|
|
|
|
-Release: 2%{?_dist_release}
|
|
|
|
|
|
+Version: 2.5.7
|
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
|
|
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
|
|
License: GPLv2+ and GPLv2
|
|
License: GPLv2+ and GPLv2
|
|
@@ -16,7 +16,7 @@ Patch3: gphoto2-ixany.patch
|
|
Patch5: gphoto2-device-return.patch
|
|
Patch5: gphoto2-device-return.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
-BuildRequires: libusb-devel >= 0.1.6a
|
|
|
|
|
|
+#BuildRequires: libusb-devel >= 0.1.6a
|
|
BuildRequires: libusb1-devel
|
|
BuildRequires: libusb1-devel
|
|
BuildRequires: libexif-devel
|
|
BuildRequires: libexif-devel
|
|
BuildRequires: libjpeg-devel
|
|
BuildRequires: libjpeg-devel
|
|
@@ -26,7 +26,7 @@ BuildRequires: popt-devel
|
|
BuildRequires: dbus-devel
|
|
BuildRequires: dbus-devel
|
|
BuildRequires: gd-devel
|
|
BuildRequires: gd-devel
|
|
# we run autoreconf:
|
|
# we run autoreconf:
|
|
-BuildRequires: autoconf, automake, libtool, gettext, cvs
|
|
|
|
|
|
+#BuildRequires: autoconf, automake, libtool, gettext, cvs
|
|
Obsoletes: gphoto2 < 2.4.0
|
|
Obsoletes: gphoto2 < 2.4.0
|
|
Obsoletes: gphoto2-devel < 2.4.0
|
|
Obsoletes: gphoto2-devel < 2.4.0
|
|
|
|
|
|
@@ -44,8 +44,8 @@ Summary: Headers and links to compile against the libgphoto2 library
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
Requires: %{name} = %{version}-%{release}
|
|
Requires: %{name} = %{version}-%{release}
|
|
Requires: pkgconfig
|
|
Requires: pkgconfig
|
|
-Requires: libusb-devel >= 0.1.6a
|
|
|
|
-Requires: libusb1
|
|
|
|
|
|
+#Requires: libusb-devel >= 0.1.6a
|
|
|
|
+#Requires: libusb1-devel
|
|
Requires: libexif-devel
|
|
Requires: libexif-devel
|
|
Obsoletes: gphoto2 < 2.4.0-11
|
|
Obsoletes: gphoto2 < 2.4.0-11
|
|
Obsoletes: gphoto2-devel < 2.4.0-11
|
|
Obsoletes: gphoto2-devel < 2.4.0-11
|
|
@@ -67,32 +67,15 @@ use libgphoto2.
|
|
%patch3 -p1 -b .ixany
|
|
%patch3 -p1 -b .ixany
|
|
%patch5 -p1 -b .device-return
|
|
%patch5 -p1 -b .device-return
|
|
|
|
|
|
-for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB $(find -name 'README.*'); do
|
|
|
|
- mv ${i} ${i}.old
|
|
|
|
- iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
|
|
|
|
- touch -r ${i}.old ${i} || :
|
|
|
|
- rm -f ${i}.old
|
|
|
|
|
|
+for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
|
|
|
|
+ mv ${i} ${i}.old
|
|
|
|
+ iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
|
|
|
|
+ touch -r ${i}.old ${i} || :
|
|
|
|
+ rm -f ${i}.old
|
|
done
|
|
done
|
|
-
|
|
|
|
-# FIXME: These .pc.in files aren't actually being installed?
|
|
|
|
-cat > gphoto2.pc.in << \EOF
|
|
|
|
-prefix=@prefix@
|
|
|
|
-exec_prefix=@exec_prefix@
|
|
|
|
-libdir=@libdir@
|
|
|
|
-includedir=@includedir@
|
|
|
|
-VERSION=@VERSION@
|
|
|
|
-
|
|
|
|
-Name: gphoto2
|
|
|
|
-Description: Library for easy access to digital cameras
|
|
|
|
-Requires:
|
|
|
|
-Version: @VERSION@
|
|
|
|
-Libs: -L${libdir} -lgphoto2 -lgphoto2_port -lm
|
|
|
|
-Cflags: -I${includedir} -I${includedir}/gphoto2
|
|
|
|
-EOF
|
|
|
|
-sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
-export CFLAGS=$RPM_OPT_FLAGS
|
|
|
|
|
|
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
|
%configure \
|
|
%configure \
|
|
udevscriptdir='/lib/udev' \
|
|
udevscriptdir='/lib/udev' \
|
|
--with-drivers=all \
|
|
--with-drivers=all \
|
|
@@ -101,6 +84,13 @@ export CFLAGS=$RPM_OPT_FLAGS
|
|
--disable-rpath \
|
|
--disable-rpath \
|
|
--without-aalib \
|
|
--without-aalib \
|
|
--without-hal
|
|
--without-hal
|
|
|
|
+
|
|
|
|
+# Don't use rpath!
|
|
|
|
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
|
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
|
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libgphoto2_port/libtool
|
|
|
|
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libgphoto2_port/libtool
|
|
|
|
+
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
%install
|
|
@@ -113,8 +103,9 @@ install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
|
|
export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
|
|
export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
|
|
export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}
|
|
export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}
|
|
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
|
|
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
|
|
-$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list hal-fdi | \
|
|
|
|
-grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
|
|
|
|
|
|
+
|
|
|
|
+#$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list hal-fdi | \
|
|
|
|
+#grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
|
|
|
|
|
|
# Output udev rules for device identification; this is used by GVfs gphoto2
|
|
# Output udev rules for device identification; this is used by GVfs gphoto2
|
|
# backend and others.
|
|
# backend and others.
|
|
@@ -125,19 +116,36 @@ mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d
|
|
$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
|
|
$RPM_BUILD_ROOT%{_libdir}/%{name}/print-camera-list udev-rules version 136 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules
|
|
popd
|
|
popd
|
|
|
|
|
|
-rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
|
|
|
|
-rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
|
|
|
|
-rm -rf %{buildroot}%{_libdir}/*.a
|
|
|
|
-rm -rf %{buildroot}%{_libdir}/*.la
|
|
|
|
|
|
+# remove circular symlink in /usr/include/gphoto2 (#460807)
|
|
|
|
+rm -f $RPM_BUILD_ROOT%{_includedir}/gphoto2/gphoto2
|
|
|
|
+
|
|
|
|
+# remove unneeded print-camera-list from libdir (#745081)
|
|
|
|
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgphoto2/print-camera-list
|
|
|
|
|
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgphoto2/*/*a
|
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libgphoto2_port/*/*a
|
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
|
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
|
|
|
|
+
|
|
|
|
+rm -f libgphoto.lang
|
|
%find_lang %{name}-6
|
|
%find_lang %{name}-6
|
|
-%find_lang %{name}_port-10
|
|
|
|
-cat libgphoto2*.lang >> %{name}.lang
|
|
|
|
|
|
+%find_lang %{name}_port-12
|
|
|
|
+cat %{name}*.lang >> libgphoto.lang
|
|
|
|
+
|
|
|
|
+# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
|
|
|
|
+rm -rf __doc
|
|
|
|
+mkdir -p __doc
|
|
|
|
+mv $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/* __doc
|
|
|
|
+rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
|
|
|
|
|
|
%clean
|
|
%clean
|
|
rm -rf "${RPM_BUILD_ROOT}"
|
|
rm -rf "${RPM_BUILD_ROOT}"
|
|
|
|
|
|
-%files -f %{name}.lang
|
|
|
|
|
|
+%post -p /sbin/ldconfig
|
|
|
|
+
|
|
|
|
+%postun -p /sbin/ldconfig
|
|
|
|
+
|
|
|
|
+%files -f libgphoto.lang
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
%doc AUTHORS COPYING README NEWS
|
|
%doc AUTHORS COPYING README NEWS
|
|
%dir %{_libdir}/libgphoto2_port
|
|
%dir %{_libdir}/libgphoto2_port
|
|
@@ -147,17 +155,13 @@ rm -rf "${RPM_BUILD_ROOT}"
|
|
%{_libdir}/libgphoto2_port/*/*.so
|
|
%{_libdir}/libgphoto2_port/*/*.so
|
|
%{_libdir}/libgphoto2/*/*.so
|
|
%{_libdir}/libgphoto2/*/*.so
|
|
%{_libdir}/*.so.*
|
|
%{_libdir}/*.so.*
|
|
-%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
|
|
|
|
|
|
+#{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
|
|
/lib/udev/rules.d/40-libgphoto2.rules
|
|
/lib/udev/rules.d/40-libgphoto2.rules
|
|
/lib/udev/check-ptp-camera
|
|
/lib/udev/check-ptp-camera
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
|
|
-
|
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
|
-
|
|
|
|
%files devel
|
|
%files devel
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%doc %{_docdir}/%{name}
|
|
|
|
|
|
+%doc __doc/*
|
|
%{_datadir}/libgphoto2
|
|
%{_datadir}/libgphoto2
|
|
%{_bindir}/gphoto2-config*
|
|
%{_bindir}/gphoto2-config*
|
|
%{_bindir}/gphoto2-port-config
|
|
%{_bindir}/gphoto2-port-config
|
|
@@ -168,6 +172,9 @@ rm -rf "${RPM_BUILD_ROOT}"
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Feb 8 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.5.7-1
|
|
|
|
+- updated to 2.5.7
|
|
|
|
+
|
|
* Wed Oct 02 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.0-2
|
|
* Wed Oct 02 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.0-2
|
|
- rebuilt with gd-2.1.0.
|
|
- rebuilt with gd-2.1.0.
|
|
|
|
|