rpms/gphoto2/devel gphoto2.spec,1.91,1.92
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Mon Jun 2 09:27:16 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2306
Modified Files:
gphoto2.spec
Log Message:
* Mon Jun 2 2008 Jindrich Novy <jnovy at redhat.com> 2.4.1-1
- update to 2.4.1 (#443515, #436138)
- remove libgphoto2, it's now packaged separately
Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gphoto2.spec 22 Apr 2008 17:21:17 -0000 1.91
+++ gphoto2.spec 2 Jun 2008 09:26:31 -0000 1.92
@@ -3,26 +3,15 @@
Summary: Software for accessing digital cameras
Name: gphoto2
-%define pkg gphoto2
-%define pkgver 2.4.0
-%define libpkg libgphoto2
-%define libver 2.4.0
-Version: %{pkgver}
-Release: 9%{?dist}
-License: GPLv2 and LGPLv2+
+Version: 2.4.1
+Release: 1%{?dist}
+License: GPLv2
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
-Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
-Patch1: gphoto2-pkgcfg.patch
-Patch2: gphoto2-storage.patch
-Patch3: gphoto2-ixany.patch
-Patch4: gphoto2-data-phase.patch
-Patch100: gphoto2-libusb-fix-build.patch
+Source0: http://prdownloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
Url: http://www.gphoto.org/
ExcludeArch: s390 s390x
-Provides: libgphoto2 = %{libver}
-Requires: lockdev
+BuildRequires: libgphoto2-devel
BuildRequires: libusb-devel >= 0.1.5
BuildRequires: lockdev-devel
BuildRequires: libexif-devel
@@ -30,11 +19,6 @@
BuildRequires: libtool, pkgconfig, sharutils
BuildRequires: libtool-ltdl-devel, popt-devel
-# for gphoto2-libusb-fix-build.patch
-BuildRequires: automake autoconf
-
-
-####################################
%description
The gPhoto2 project is a universal, free application and library
framework that lets you download images from several different
@@ -45,171 +29,41 @@
This package contains
i) the library that digital camera applications can use
-ii) the command-line utility gphoto2
+ii) the command-line utility gphoto2
Other (GUI) frontends are available separately.
-####################################
-%package devel
-Summary: Headers and links to compile against the libgphoto2 library.
-Requires: %{name} = %{version}
-Requires: pkgconfig
-Requires: libexif-devel libusb-devel
-Group: Development/Libraries
-
-####################################
-%description devel
-The gPhoto2 project is a universal, free application and library
-framework that lets you download images from several different
-digital camera models, including the newer models with USB
-connections. Note that for some older camera models you must use
-the old "gphoto" package.
-
-This package contains the files needed to compile applications that
-use libgphoto2.
-
-########################################################################
-# Building and installing the beast into %{buildroot}
-########################################################################
-
-####################################
%prep
-%setup -q -a 1
-%patch1 -p1 -b .pkgcfg
-%patch2 -p1 -b .storage
-%patch3 -p1 -b .ixany
-%patch4 -p1 -b .data-phase
-%patch100 -p1 -b .libusb
-
-# write pkg-config stuff
-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
+%setup -q
-####################################
%build
-
-pushd %{libpkg}-%{libver}
-export CFLAGS=$RPM_OPT_FLAGS
-autoreconf
-%configure \
- --with-drivers=all \
- --with-doc-dir=%{_docdir}/%{name} \
- --disable-static \
- --without-aalib
-
-make
-popd
-
-export LIBGPHOTO2_LIBS="-L../%{libpkg}-%{libver}/%{libpkg}/.libs -L../%{libpkg}-%{libver}/%{libpkg}_port/%{libpkg}_port/.libs -lgphoto2 -lgphoto2_port"
-export LIBGPHOTO2_CFLAGS="-I../%{libpkg}-%{libver} -I../%{libpkg}-%{libver}/%{libpkg}_port"
%configure \
--enable-docs \
--enable-lockdev \
--with-doc-dir=%{_docdir}/%{name}
-
-make
+make %{?_smp_mflags}
-####################################
%install
rm -rf "${RPM_BUILD_ROOT}"
-
-pushd %{libpkg}-%{libver}
- export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
- make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
-
- pushd packaging/linux-hotplug/
- install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/
- export LIBDIR=$RPM_BUILD_ROOT%{_libdir}
- export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver}
- export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
- $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | \
- grep -v "<!-- This file was generated" > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
- popd
-popd
-
make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
-
-install -m644 gphoto2.pc gphoto2-port.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-
-rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a
-rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a
-rm -rf %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_libdir}/*.la
-
+rm -rf %{buildroot}%{_docdir}/%{name}/*.sh
%find_lang %{name}
-%find_lang %{libpkg}-2
-%find_lang %{libpkg}_port-0
-cat libgphoto2*.lang >> %{name}.lang
-####################################
%clean
rm -rf "${RPM_BUILD_ROOT}"
-########################################################################
-# file list and installation for main package
-########################################################################
-
-####################################
%files -f %{name}.lang
%defattr(-,root,root)
-%doc AUTHORS README COPYING
+%doc COPYING NEWS README
%{_bindir}/gphoto2
-%{_datadir}/libgphoto2
-%dir %{_libdir}/libgphoto2_port
-%dir %{_libdir}/libgphoto2_port/*
-%{_libdir}/libgphoto2_port/*/*.so
-%dir %{_libdir}/libgphoto2
-%dir %{_libdir}/libgphoto2/*
-%{_libdir}/libgphoto2/*/*.so
-%{_libdir}/*.so.*
%{_mandir}/man1/gphoto2.1*
-%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
-%{_libdir}/udev/check-ptp-camera
-%{_libdir}/udev/check-mtp-device
-
-####################################
-%post
-# register libraries
-/sbin/ldconfig
-
-####################################
-%postun
-# unregister libraries
-/sbin/ldconfig
-
-########################################################################
-# file list and installation for -devel subpackage
-########################################################################
-####################################
-%files devel
-%defattr(-,root,root)
-%doc %{_docdir}/gphoto2
-%{_bindir}/gphoto2-config*
-%{_bindir}/gphoto2-port-config
-%{_includedir}/gphoto2
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
-%{_mandir}/man3/*
-
-########################################################################
-# ChangeLog
-########################################################################
%changelog
+* Mon Jun 2 2008 Jindrich Novy <jnovy at redhat.com> 2.4.1-1
+- update to 2.4.1 (#443515, #436138)
+- remove libgphoto2, it's now packaged separately
+
* Tue Apr 22 2008 David Zeuthen <davidz at redhat.com> 2.4.0-9
- Rebuild
More information about the fedora-extras-commits
mailing list