rpms/libgphoto2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Bump to latest upstream version.

Browse Source
This commit is contained in:
Jon Disnard 2014-02-12 02:15:37 -06:00
parent b8ff06210b
commit b944ca8de2
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/libgphoto2-2.5.1.1.tar.bz2 /libgphoto2-2.5.1.1.tar.bz2
/libgphoto2-2.5.2.tar.bz2 /libgphoto2-2.5.2.tar.bz2
/libgphoto2-2.5.3.tar.bz2

48
libgphoto2.spec
View File

@ -1,19 +1,19 @@
%global udevdir %(pkg-config --variable=udevdir udev) %global udevdir %(pkg-config --variable=udevdir udev)
Name: libgphoto2 Name: libgphoto2
Version: 2.5.2 Version: 2.5.3
Release: 1%{?dist} Release: 6%{?dist}
Summary: Library for accessing digital cameras Summary: Library for accessing digital cameras
Group: Development/Libraries Group: Development/Libraries
# 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
URL: http://www.gphoto.org/ URL: http://www.gphoto.org/
Source0: http://downloads.sourceforge.net/gphoto/libgphoto2-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
Patch1: gphoto2-pkgcfg.patch Patch1: gphoto2-pkgcfg.patch
Patch2: gphoto2-storage.patch Patch2: gphoto2-storage.patch
Patch3: gphoto2-ixany.patch Patch3: gphoto2-ixany.patch
Patch4: gphoto2-device-return.patch Patch4: gphoto2-device-return.patch
BuildRequires: libusb1-devel, libusb-devel >= 0.1.5 BuildRequires: libusbx-devel
BuildRequires: lockdev-devel BuildRequires: lockdev-devel
BuildRequires: libexif-devel BuildRequires: libexif-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
@ -35,7 +35,6 @@ however, such as gtkam for example.
Summary: Headers and links to compile against the libgphoto2 library Summary: Headers and links to compile against the libgphoto2 library
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libusb-devel >= 0.1.5, libexif-devel
Obsoletes: gphoto2-devel < 2.4.0-11 Obsoletes: gphoto2-devel < 2.4.0-11
Provides: gphoto2-devel = %{version}-%{release} Provides: gphoto2-devel = %{version}-%{release}
@ -57,21 +56,21 @@ use libgphoto2.
%patch4 -p1 -b .device-return %patch4 -p1 -b .device-return
for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
mv ${i} ${i}.old mv ${i} ${i}.old
iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i} iconv -f ISO-8859-1 -t UTF-8 < ${i}.old > ${i}
touch -r ${i}.old ${i} || : touch -r ${i}.old ${i} || :
rm -f ${i}.old rm -f ${i}.old
done done
%build %build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure \ %configure \
udevscriptdir='%{udevdir}' \ udevscriptdir='%{udevdir}' \
--with-drivers=all \ --with-drivers=all \
--with-doc-dir=%{_docdir}/%{name} \ --with-doc-dir=%{_docdir}/%{name} \
--disable-static \ --disable-static \
--disable-rpath --disable-rpath
# Don't use rpath! # Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -112,6 +111,10 @@ rm -rf %{buildroot}%{_libdir}/*.la
%find_lang %{name}_port-10 %find_lang %{name}_port-10
cat libgphoto2*.lang >> %{name}.lang cat libgphoto2*.lang >> %{name}.lang
# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
mkdir __doc
mv %{buildroot}%{_defaultdocdir}/%{name}/* __doc
rm -rf %{buildroot}%{_defaultdocdir}/%{name}
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -130,7 +133,7 @@ cat libgphoto2*.lang >> %{name}.lang
%{udevdir}/check-ptp-camera %{udevdir}/check-ptp-camera
%files devel %files devel
%doc %{_docdir}/%{name} %doc __doc/*
%{_datadir}/libgphoto2 %{_datadir}/libgphoto2
%{_bindir}/gphoto2-config* %{_bindir}/gphoto2-config*
%{_bindir}/gphoto2-port-config %{_bindir}/gphoto2-port-config
@ -140,6 +143,21 @@ cat libgphoto2*.lang >> %{name}.lang
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Wed Feb 12 2014 Jon Disnard <jdisnard@gmail.com> - 2.5.3-6
- Bump to latest upstream version.
* Wed Aug 28 2013 Tim Waugh <twaugh@redhat.com> - 2.5.2-5
- Fixed documentation issue due to unversioned doc dirs (bug #1001263).
* Fri Aug 16 2013 Tim Waugh <twaugh@redhat.com> - 2.5.2-4
- Build against libusbx instead of libusb (bug #997880).
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Jun 11 2013 Remi Collet <rcollet@redhat.com> - 2.5.2-2
- rebuild for new GD 2.1.0
* Mon May 6 2013 Hans de Goede <hdegoede@redhat.com> - 2.5.2-1 * Mon May 6 2013 Hans de Goede <hdegoede@redhat.com> - 2.5.2-1
- New upstream release bugfix 2.5.2 - New upstream release bugfix 2.5.2
- Drop bugfix patches (merged upstream) - Drop bugfix patches (merged upstream)

2
sources
View File

@ -1 +1 @@
28e0c0d449f80917fb3f79bdefbbe0ec libgphoto2-2.5.2.tar.bz2 c1604751d0ea966fd26687f8373cb20d libgphoto2-2.5.3.tar.bz2