rpms/libdc1394/F-11 .cvsignore, 1.4, 1.5 libdc1394.spec, 1.5, 1.6 sources, 1.4, 1.5

[Tim Niemueller]

Author: timn

Update of /cvs/pkgs/rpms/libdc1394/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16166

Modified Files:
	.cvsignore libdc1394.spec sources 
Log Message:
Update to latest stable release 2.1.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdc1394/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	17 Mar 2009 14:47:28 -0000	1.4
+++ .cvsignore	11 Jun 2009 22:34:52 -0000	1.5
@@ -1 +1 @@
-libdc1394-2.1.0.tar.gz
+libdc1394-2.1.2.tar.gz


Index: libdc1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdc1394/F-11/libdc1394.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libdc1394.spec	17 Mar 2009 14:47:28 -0000	1.5
+++ libdc1394.spec	11 Jun 2009 22:34:52 -0000	1.6
@@ -7,7 +7,7 @@
 
 Summary: 1394-based digital camera control library
 Name: libdc1394
-Version: 2.1.0
+Version: 2.1.2
 Release: 1%{?svn_snapshot}%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -16,8 +16,9 @@ Source: http://dl.sf.net/libdc1394/libdc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: kernel-headers
-BuildRequires: libraw1394-devel
+BuildRequires: libraw1394-devel libusb1-devel
 BuildRequires: doxygen
+BuildRequires: libX11-devel libXv-devel
 %if %{svn_build}
 BuildRequires: libtool
 %endif
@@ -65,7 +66,7 @@ autoheader
 autoconf
 automake --add-missing
 %endif
-%configure --disable-static --enable-doxygen-html --enable-doxygen-dot %{!?_without_juju:--with-juju-dir=/usr/include}
+%configure --disable-static --enable-doxygen-html --enable-doxygen-dot
 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
 make %{?_smp_mflags}
@@ -76,7 +77,13 @@ make doc
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version}
 %{__install} -p -m 0644 doc/html/* %{buildroot}%{_docdir}/%{name}-docs-%{version}
-%{!?_without_juju:rm -f %{buildroot}/%{_mandir}/man1/dc1394_vloopback.1}
+for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do
+	%{__install} -p -m 0644 examples/$p %{buildroot}%{_bindir}/dc1394_$p
+done
+%{__install} -p -m 0644 examples/dc1394_multiview %{buildroot}%{_bindir}/dc1394_multiview
+for f in grab_color_image grab_gray_image grab_partial_image; do
+	mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1
+done
 
 %post -p /sbin/ldconfig
 
@@ -104,13 +111,13 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-
 
 %files tools
 %defattr(-, root, root, 0755)
-%{_bindir}/dc1394_reset_bus
-%{_bindir}/dc1394_vloopback
-%{_mandir}/man1/dc1394_reset_bus.1.gz
-%{?_without_juju:%{_mandir}/man1/dc1394_vloopback.1.gz}
-
+%{_bindir}/dc1394_*
+%{_mandir}/man1/dc1394_*.1.gz
 
 %changelog
+* Thu Jun 11 2009 Tim Niemueller <tim at niemueller.de> - 2.1.2-1
+- Update to latest stable release 2.1.2
+
 * Tue Mar 17 2009 Tim Niemueller <tim at niemueller.de> - 2.1.0-1
 - Update to latest stable release 2.1.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdc1394/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	17 Mar 2009 14:47:28 -0000	1.4
+++ sources	11 Jun 2009 22:34:52 -0000	1.5
@@ -1 +1 @@
-51909785c8c3da6881dd983c98c0c6d6  libdc1394-2.1.0.tar.gz
+b85f1ade88d8d96688d5965ed8603d53  libdc1394-2.1.2.tar.gz