rpms/libdc1394/F-10 .cvsignore, 1.3, 1.4 libdc1394.spec, 1.3, 1.4 sources, 1.3, 1.4

[Tim Niemueller]

Author: timn

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

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-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	16 May 2008 20:04:59 -0000	1.3
+++ .cvsignore	11 Jun 2009 20:58:14 -0000	1.4
@@ -1 +1 @@
-libdc1394-2.0.2.tar.gz
+libdc1394-2.1.2.tar.gz


Index: libdc1394.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdc1394/F-10/libdc1394.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libdc1394.spec	16 May 2008 20:04:59 -0000	1.3
+++ libdc1394.spec	11 Jun 2009 20:58:14 -0000	1.4
@@ -2,21 +2,21 @@
 
 #define svn_snapshot .svn459  
 #define real_version 2.0.0-rc8%{svn_snapshot}
-%define real_version 2.0.2
+#%define real_version 2.1.0
 %define svn_build %{?svn_snapshot:1}%{!?svn_snapshot:0}
 
 Summary: 1394-based digital camera control library
 Name: libdc1394
-Version: 2.0.2
+Version: 2.1.2
 Release: 1%{?svn_snapshot}%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/libdc1394/
-Source: http://dl.sf.net/libdc1394/libdc1394-%{real_version}.tar.gz
+Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: kernel-headers
-BuildRequires: libraw1394-devel
+BuildRequires: libraw1394-devel libusb1-devel
 BuildRequires: doxygen
 %if %{svn_build}
 BuildRequires: libtool
@@ -55,7 +55,7 @@ This package contains tools that are use
 developing with %{name}.
 
 %prep
-%setup -q -n libdc1394-%{real_version}
+%setup -q -n libdc1394-%{version}
 
 %build
 %if %{svn_build}
@@ -65,7 +65,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 +76,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 +110,19 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-
 
 %files tools
 %defattr(-, root, root, 0755)
-%{_bindir}/dc1394_reset_bus
-%{?_without_juju:%{_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
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon May 12 2008 Tim Niemueller <tim at niemueller.de> - 2.0.2-1
 - Update to latest stable release 2.0.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdc1394/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 May 2008 20:04:59 -0000	1.3
+++ sources	11 Jun 2009 20:58:14 -0000	1.4
@@ -1 +1 @@
-c2dc94e9568765f34f7a23b31b9c2f6d  libdc1394-2.0.2.tar.gz
+b85f1ade88d8d96688d5965ed8603d53  libdc1394-2.1.2.tar.gz