rpms/gphoto2/devel gphoto2.spec,1.93,1.94

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/gphoto2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16134

Modified Files:
	gphoto2.spec 
Log Message:
* Sat Aug  2 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-2
- merge review fixes (#225855):
  - remove useless multilib_arches needed because of libgphoto2
  - fix source0 URL
  - fix description to not to mention the library is shipped
  - remove unused/pointless configure parameters
  - preserve timestamps
  - fix license
  - drop redundant BR libusb-devel, libexif-devel, lockdev-devel
  - add BR gettext
  - use %{buildroot} exclusively




Index: gphoto2.spec
===================================================================
RCS file: /cvs/extras/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gphoto2.spec	1 Aug 2008 19:09:18 -0000	1.93
+++ gphoto2.spec	2 Aug 2008 07:26:44 -0000	1.94
@@ -1,20 +1,15 @@
-# Arches on which we need to prevent arch conflicts in gphoto2-config
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
-
 Summary: Software for accessing digital cameras
 Name: gphoto2
 Version: 2.4.2
-Release: 1%{?dist}
-License: GPLv2
+Release: 2%{?dist}
+License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
-BuildRequires: libgphoto2-devel
-BuildRequires: libusb-devel >= 0.1.5
-BuildRequires: lockdev-devel
-BuildRequires: libexif-devel
+BuildRequires: libgphoto2-devel, gettext
 BuildRequires: libjpeg-devel, readline-devel
 BuildRequires: libtool, pkgconfig, sharutils
 BuildRequires: libtool-ltdl-devel, popt-devel
@@ -27,9 +22,7 @@
 a) for some older camera models you must use the old "gphoto" package.
 b) for USB mass storage models you must use the driver in the kernel
 
-This package contains
-i) the library that digital camera applications can use
-ii) the command-line utility gphoto2
+This package contains the command-line utility gphoto2.
 
 Other (GUI) frontends are available separately.
 
@@ -37,29 +30,37 @@
 %setup -q
 
 %build
-%configure \
-	--enable-docs \
-	--enable-lockdev \
-	--with-doc-dir=%{_docdir}/%{name}
+%configure
 make %{?_smp_mflags}
 
-
 %install
-rm -rf "${RPM_BUILD_ROOT}"
-make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make install INSTALL="%{__install} -p" DESTDIR=%{buildroot}
 rm -rf %{buildroot}%{_docdir}/%{name}/*.sh
 %find_lang %{name}
 
 %clean
-rm -rf "${RPM_BUILD_ROOT}"
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING NEWS README
+%doc COPYING ChangeLog NEWS README TODO
 %{_bindir}/gphoto2
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Sat Aug  2 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-2
+- merge review fixes (#225855):
+  - remove useless multilib_arches needed because of libgphoto2
+  - fix source0 URL
+  - fix description to not to mention the library is shipped
+  - remove unused/pointless configure parameters
+  - preserve timestamps
+  - fix license
+  - drop redundant BR libusb-devel, libexif-devel, lockdev-devel
+  - add BR gettext
+  - use %{buildroot} exclusively
+
 * Fri Aug  1 2008 Jindrich Novy <jnovy at redhat.com> 2.4.2-1
 - update to 2.4.2
 - introduces --capture-image and --capture-image-and-download