From e86b2db0630068d94727fc2c9187ebbd6ec82261 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 19 Jan 2008 20:48:52 +0000 Subject: [PATCH 01/52] Setup of module libdc1394 --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1de43b2 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: libdc1394 +# $Id$ +NAME := libdc1394 +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 46e75db0f8db6a9a7686d9a4b61a467862342d8b Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sat, 19 Jan 2008 23:30:06 +0000 Subject: [PATCH 02/52] Initial import of libdc1394 to devel branch --- .cvsignore | 1 + libdc1394.spec | 159 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 161 insertions(+) create mode 100644 libdc1394.spec diff --git a/.cvsignore b/.cvsignore index e69de29..8bd4786 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +libdc1394-2.0.1.tar.gz diff --git a/libdc1394.spec b/libdc1394.spec new file mode 100644 index 0000000..1acc630 --- /dev/null +++ b/libdc1394.spec @@ -0,0 +1,159 @@ +# $Id: libdc1394.spec,v 1.1 2008/01/19 23:30:06 timn Exp $ + +#define svn_snapshot .svn459 +#define real_version 2.0.0-rc8%{svn_snapshot} +%define real_version 2.0.1 +%define svn_build %{?svn_snapshot:1}%{!?svn_snapshot:0} + +Summary: 1394-based digital camera control library +Name: libdc1394 +Version: 2.0.1 +Release: 3%{?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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +BuildRequires: kernel-headers +BuildRequires: libraw1394-devel +BuildRequires: doxygen +%if %{svn_build} +BuildRequires: libtool +%endif + +%description +Libdc1394 is a library that is intended to provide a high level programming +interface for application developers who wish to control IEEE 1394 based +cameras that conform to the 1394-based Digital Camera Specification. + +%package devel +Summary: Header files and libraries for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, libraw1394-devel +Requires: pkgconfig + +%description devel +This package contains the header files and libraries +for %{name}. If you like to develop programs using %{name}, +you will need to install %{name}-devel. + +%package docs +Summary: Development documentation for %{name} +Group: Documentation + +%description docs +This package contains the development documentation for %{name}. + +%package tools +Summary: Tools for use with %{name} +Group: Applications/System +Requires: %{name} = %{version} + +%description tools +This package contains tools that are useful when working and +developing with %{name}. + +%prep +%setup -q -n libdc1394-%{real_version} + +%build +%if %{svn_build} +cp /usr/share/libtool/ltmain.sh . +aclocal +autoheader +autoconf +automake --add-missing +%endif +%configure --disable-static --enable-doxygen-html --enable-doxygen-dot %{!?_without_juju:--with-juju-dir=/usr/include} +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} +make doc + +%install +%{__rm} -rf %{buildroot} +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} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-, root, root, 0755) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/libdc1394*.so.* + +%files devel +%defattr(-, root, root, 0755) +%doc examples/*.h examples/*.c +%{_includedir}/dc1394/ +%{_libdir}/libdc1394*.so +%{_libdir}/pkgconfig/%{name}-2.pc +%exclude %{_libdir}/*.la + +%files docs +%defattr(-, root, root, 0755) +%{_docdir}/%{name}-docs-%{version} + +%files tools +%defattr(-, root, root, 0755) +%{_bindir}/dc1394_reset_bus +%{?_without_juju:%{_bindir}/dc1394_vloopback} + +%changelog +* Sat Jan 19 2008 Tim Niemueller - 2.0.1-3 +- Made autotools calls optional, only called if svn_snapshot is defined +- devel subpackage now requires pkgconfig + +* Wed Jan 16 2008 Tim Niemueller - 2.0.1-2 +- Add docs subpackage to contain development documentation +- Incoroprate multilib tricks +- BuildReqire automake, autoconf, libtool and doxygen +- Removed unused BuildRequires +- Use header file from kernel-headers instead of kernel-devel +- BuildRequire kernel-devel +- Added tools subpackage to contain the resetbus and vloopback tools + +* Wed Jan 16 2008 Tim Niemueller - 2.0.1-1 +- Update to 2.0.1, now patent-free! + +* Mon Jan 07 2008 Tim Niemueller - 2.0.0-1 +- Update to 2.0.0 + +* Thu Dec 16 2007 Tim Niemueller - 2.0.0-rc9 +- Update to 2.0.0-rc9 + +* Wed Nov 28 2007 Tim Niemueller - 2.0.0-rc7.3.svn459 +- Updated to release 2.0.0-rc7+svn459 (not yet released) + +* Fri Nov 02 2007 Tim Niemueller - 2.0.0-rc7.1.svn443 +- Updated to release 2.0.0-rc7+svn443 (not yet released) for juju support +- Added --without juju to disable juju support (necessary for FC6) + +* Fri Feb 02 2007 Tim Niemueller - 2.0.0-rc5.1 +- Updated to release 2.0.0-rc5. + +* Wed Aug 16 2006 Tim Niemueller - 2.0.0-rc3.1 +- Updated to release 2.0.0-rc3. + +* Mon May 08 2006 Dries Verachtert - 2.0.0-0.1.pre7 +- Updated to release 2.0.0-0.1.pre7. + +* Sat Apr 08 2006 Dries Verachtert - 2.0.0-0.1.pre5.2 +- Rebuild for Fedora Core 5. + +* Thu Dec 8 2005 Matthias Saou 2.0.0-0.1.pre5 +- Update to 2.0.0-pre5. +- Add missing libraw1394-devel dependency to the devel package. + +* Tue Aug 30 2005 Dries Verachtert - 2.0.0-0.pre4 +- Update to release 2.0.0-0.pre4. + +* Thu Aug 25 2005 Dries Verachtert - 1.1.0-1 +- Initial package. diff --git a/sources b/sources index e69de29..246fefb 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6b5abeed347e7f6682f4fa9f06437a5f libdc1394-2.0.1.tar.gz From 83d9ffd3f4d099ba14c2eedc9b4c68e057063bc3 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Sat, 9 Feb 2008 00:09:13 +0000 Subject: [PATCH 03/52] Rebuild with GCC 4.3 for rawhide (F9) --- libdc1394.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 1acc630..2aa06c0 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,4 +1,4 @@ -# $Id: libdc1394.spec,v 1.1 2008/01/19 23:30:06 timn Exp $ +# $Id: libdc1394.spec,v 1.2 2008/02/09 00:09:13 timn Exp $ #define svn_snapshot .svn459 #define real_version 2.0.0-rc8%{svn_snapshot} @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.0.1 -Release: 3%{?svn_snapshot}%{?dist} +Release: 4%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -107,6 +107,9 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version} %{?_without_juju:%{_bindir}/dc1394_vloopback} %changelog +* Sat Feb 09 2008 Tim Niemueller - 2.0.1-4 +- Rebuild with GCC 4.3 for rawhide (F9) + * Sat Jan 19 2008 Tim Niemueller - 2.0.1-3 - Made autotools calls optional, only called if svn_snapshot is defined - devel subpackage now requires pkgconfig From 329a57139aa40033ef57e9c4140f40d36c0e474c Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Fri, 16 May 2008 20:04:59 +0000 Subject: [PATCH 04/52] Update to latest stable release 2.0.2 --- .cvsignore | 2 +- libdc1394.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8bd4786..d0141d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libdc1394-2.0.1.tar.gz +libdc1394-2.0.2.tar.gz diff --git a/libdc1394.spec b/libdc1394.spec index 2aa06c0..4f1c7f8 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,14 +1,14 @@ -# $Id: libdc1394.spec,v 1.2 2008/02/09 00:09:13 timn Exp $ +# $Id: libdc1394.spec,v 1.3 2008/05/16 20:04:59 timn Exp $ #define svn_snapshot .svn459 #define real_version 2.0.0-rc8%{svn_snapshot} -%define real_version 2.0.1 +%define real_version 2.0.2 %define svn_build %{?svn_snapshot:1}%{!?svn_snapshot:0} Summary: 1394-based digital camera control library Name: libdc1394 -Version: 2.0.1 -Release: 4%{?svn_snapshot}%{?dist} +Version: 2.0.2 +Release: 1%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -76,6 +76,7 @@ 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} %post -p /sbin/ldconfig @@ -105,10 +106,13 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version} %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} + %changelog -* Sat Feb 09 2008 Tim Niemueller - 2.0.1-4 -- Rebuild with GCC 4.3 for rawhide (F9) +* Mon May 12 2008 Tim Niemueller - 2.0.2-1 +- Update to latest stable release 2.0.2 * Sat Jan 19 2008 Tim Niemueller - 2.0.1-3 - Made autotools calls optional, only called if svn_snapshot is defined diff --git a/sources b/sources index 246fefb..ef6fb71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b5abeed347e7f6682f4fa9f06437a5f libdc1394-2.0.1.tar.gz +c2dc94e9568765f34f7a23b31b9c2f6d libdc1394-2.0.2.tar.gz From e1ea58ffc0c5d9e1607ca90a13e9828073912c64 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 14:20:21 +0000 Subject: [PATCH 05/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- libdc1394.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 4f1c7f8..32d1864 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,4 +1,4 @@ -# $Id: libdc1394.spec,v 1.3 2008/05/16 20:04:59 timn Exp $ +# $Id: libdc1394.spec,v 1.4 2009/02/25 14:20:21 jkeating Exp $ #define svn_snapshot .svn459 #define real_version 2.0.0-rc8%{svn_snapshot} @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.0.2 -Release: 1%{?svn_snapshot}%{?dist} +Release: 2%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -111,6 +111,9 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version} %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon May 12 2008 Tim Niemueller - 2.0.2-1 - Update to latest stable release 2.0.2 From d714e24c7e26cb63afef6a64c0d5df9ab20c4937 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Tue, 17 Mar 2009 14:47:28 +0000 Subject: [PATCH 06/52] Update to latest stable release 2.1.0 Tim --- .cvsignore | 2 +- libdc1394.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index d0141d1..c921985 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libdc1394-2.0.2.tar.gz +libdc1394-2.1.0.tar.gz diff --git a/libdc1394.spec b/libdc1394.spec index 32d1864..ab684aa 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,18 +1,18 @@ -# $Id: libdc1394.spec,v 1.4 2009/02/25 14:20:21 jkeating Exp $ +# $Id: libdc1394.spec,v 1.5 2009/03/17 14:47:28 timn Exp $ #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 -Release: 2%{?svn_snapshot}%{?dist} +Version: 2.1.0 +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 @@ -55,7 +55,7 @@ This package contains tools that are useful when working and developing with %{name}. %prep -%setup -q -n libdc1394-%{real_version} +%setup -q -n libdc1394-%{version} %build %if %{svn_build} @@ -105,12 +105,15 @@ mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version} %files tools %defattr(-, root, root, 0755) %{_bindir}/dc1394_reset_bus -%{?_without_juju:%{_bindir}/dc1394_vloopback} +%{_bindir}/dc1394_vloopback %{_mandir}/man1/dc1394_reset_bus.1.gz %{?_without_juju:%{_mandir}/man1/dc1394_vloopback.1.gz} %changelog +* Tue Mar 17 2009 Tim Niemueller - 2.1.0-1 +- Update to latest stable release 2.1.0 + * Wed Feb 25 2009 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index ef6fb71..d93c74e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2dc94e9568765f34f7a23b31b9c2f6d libdc1394-2.0.2.tar.gz +51909785c8c3da6881dd983c98c0c6d6 libdc1394-2.1.0.tar.gz From 35d6b111ff72b5a407a90f5ed22038b5ee332c0c Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Thu, 11 Jun 2009 22:41:38 +0000 Subject: [PATCH 07/52] Update to latest stable release 2.1.2 --- .cvsignore | 2 +- libdc1394.spec | 27 +++++++++++++++++---------- sources | 2 +- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index c921985..d3f4087 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libdc1394-2.1.0.tar.gz +libdc1394-2.1.2.tar.gz diff --git a/libdc1394.spec b/libdc1394.spec index ab684aa..5cc5385 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,4 +1,4 @@ -# $Id: libdc1394.spec,v 1.5 2009/03/17 14:47:28 timn Exp $ +# $Id: libdc1394.spec,v 1.6 2009/06/11 22:41:38 timn Exp $ #define svn_snapshot .svn459 #define real_version 2.0.0-rc8%{svn_snapshot} @@ -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/libdc1394-%{version}.tar.gz 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}-docs-%{version} %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 - 2.1.2-1 +- Update to latest stable release 2.1.2 + * Tue Mar 17 2009 Tim Niemueller - 2.1.0-1 - Update to latest stable release 2.1.0 diff --git a/sources b/sources index d93c74e..f32f4ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51909785c8c3da6881dd983c98c0c6d6 libdc1394-2.1.0.tar.gz +b85f1ade88d8d96688d5965ed8603d53 libdc1394-2.1.2.tar.gz From 7babdbe2dbcc099d619718c521a1c6bde2e3b2c8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 05:30:07 +0000 Subject: [PATCH 08/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- libdc1394.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 5cc5385..5fe4883 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,4 +1,4 @@ -# $Id: libdc1394.spec,v 1.6 2009/06/11 22:41:38 timn Exp $ +# $Id: libdc1394.spec,v 1.7 2009/07/25 05:30:07 jkeating Exp $ #define svn_snapshot .svn459 #define real_version 2.0.0-rc8%{svn_snapshot} @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.1.2 -Release: 1%{?svn_snapshot}%{?dist} +Release: 2%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -115,6 +115,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 11 2009 Tim Niemueller - 2.1.2-1 - Update to latest stable release 2.1.2 From 3b0efac99522b225415fb0baed01dc4262e6087a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 10 Sep 2009 13:31:44 +0000 Subject: [PATCH 09/52] - excludearch s390 s390x where we don't have libraw1394 --- libdc1394.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 5fe4883..d105d4a 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,4 +1,4 @@ -# $Id: libdc1394.spec,v 1.7 2009/07/25 05:30:07 jkeating Exp $ +# $Id: libdc1394.spec,v 1.8 2009/09/10 13:31:44 karsten Exp $ #define svn_snapshot .svn459 #define real_version 2.0.0-rc8%{svn_snapshot} @@ -8,12 +8,13 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.1.2 -Release: 2%{?svn_snapshot}%{?dist} +Release: 3%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExcludeArch: s390 s390x BuildRequires: kernel-headers BuildRequires: libraw1394-devel libusb1-devel @@ -115,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Sep 10 2009 Karsten Hopp 2.1.2-3 +- excludearch s390 s390x where we don't have libraw1394 + * Fri Jul 24 2009 Fedora Release Engineering - 2.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 663d9add95543d3ae516f50cafa0f4ceaedffb96 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:50:53 +0000 Subject: [PATCH 10/52] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1de43b2..e2bf0c2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libdc1394 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a67b94b4fb7c751c0e1f342294ab6208d4233dbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:51:03 +0000 Subject: [PATCH 11/52] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e2bf0c2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libdc1394 -# $Id$ -NAME := libdc1394 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 9b43f7666bba4e6a9e5ecf01f7ebf7254aba5865 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:13:41 -0600 Subject: [PATCH 12/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index d105d4a..54bbff8 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.1.2 -Release: 3%{?svn_snapshot}%{?dist} +Release: 4%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -116,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Sep 10 2009 Karsten Hopp 2.1.2-3 - excludearch s390 s390x where we don't have libraw1394 From 208826f24b7721c207003c41a330f478d6097053 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Wed, 4 Jan 2012 12:11:51 +0100 Subject: [PATCH 13/52] Update to latest stable release 2.1.4 --- .gitignore | 4 +++- libdc1394.spec | 7 +++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d3f4087..8d0f85a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -libdc1394-2.1.2.tar.gz +/.build* +/x86_64 +/libdc1394-2.1.4* diff --git a/libdc1394.spec b/libdc1394.spec index 54bbff8..544f635 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -7,8 +7,8 @@ Summary: 1394-based digital camera control library Name: libdc1394 -Version: 2.1.2 -Release: 4%{?svn_snapshot}%{?dist} +Version: 2.1.4 +Release: 1%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -116,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Jan 04 2012 Tim Niemueller - 2.1.4-1 +- Update to latest stable release 2.1.4 + * Mon Feb 07 2011 Fedora Release Engineering - 2.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index f32f4ac..f4a5813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b85f1ade88d8d96688d5965ed8603d53 libdc1394-2.1.2.tar.gz +a9c5306dfc17917872513355f87e8412 libdc1394-2.1.4.tar.gz From 3cdc663ef02110bcd95a4f779a38b7136a01c698 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Wed, 4 Jan 2012 14:14:27 +0100 Subject: [PATCH 14/52] Fix improperly installed tools (bz #593873) --- libdc1394.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 544f635..c00e844 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.1.4 -Release: 1%{?svn_snapshot}%{?dist} +Release: 2%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -79,7 +79,7 @@ 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} 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 + %{__install} -p -m 0644 examples/.libs/$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 @@ -116,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Jan 04 2012 Tim Niemueller - 2.1.4-2 +- Fix improperly installed tools (bz #593873) + * Wed Jan 04 2012 Tim Niemueller - 2.1.4-1 - Update to latest stable release 2.1.4 From 46666b4a2c73ee33548968be911ac422d79546d2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:32:28 -0500 Subject: [PATCH 15/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index c00e844..13ad69f 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.1.4 -Release: 2%{?svn_snapshot}%{?dist} +Release: 3%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -116,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jan 04 2012 Tim Niemueller - 2.1.4-2 - Fix improperly installed tools (bz #593873) From f0ff7029dd998e8be28ec1e95ea0964b1efb34a4 Mon Sep 17 00:00:00 2001 From: Jay Fenlason Date: Tue, 11 Dec 2012 15:50:43 -0500 Subject: [PATCH 16/52] New upstream version. --- .gitignore | 1 + libdc1394.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8d0f85a..b550c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.build* /x86_64 /libdc1394-2.1.4* +/libdc1394-2.2.0.tar.gz diff --git a/libdc1394.spec b/libdc1394.spec index 13ad69f..38acb28 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -7,12 +7,12 @@ Summary: 1394-based digital camera control library Name: libdc1394 -Version: 2.1.4 -Release: 3%{?svn_snapshot}%{?dist} +Version: 2.2.0 +Release: 1%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ -Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz +Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root ExcludeArch: s390 s390x @@ -116,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Tue Dec 11 2012 Jay Fenlason - 2.2.0-1 +- New upstream version + * Thu Jul 19 2012 Fedora Release Engineering - 2.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index f4a5813..833f18a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9c5306dfc17917872513355f87e8412 libdc1394-2.1.4.tar.gz +ed10e06987c76c79961c6906e02acf00 libdc1394-2.2.0.tar.gz From bd82918133f98c545371ca82b7a9e9b1307c8c21 Mon Sep 17 00:00:00 2001 From: Jay Fenlason Date: Tue, 29 Jan 2013 15:01:56 -0500 Subject: [PATCH 17/52] Fix two minor bugs found by rpmdiff. --- libdc1394.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 38acb28..4d5c43a 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.0 -Release: 1%{?svn_snapshot}%{?dist} +Release: 2%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -50,7 +50,7 @@ This package contains the development documentation for %{name}. %package tools Summary: Tools for use with %{name} Group: Applications/System -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description tools This package contains tools that are useful when working and @@ -79,7 +79,7 @@ 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} for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do - %{__install} -p -m 0644 examples/.libs/$p %{buildroot}%{_bindir}/dc1394_$p + %{__install} -p -m 0644 -s examples/.libs/$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 @@ -116,6 +116,10 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Tue Jan 29 2013 Jay Fenlason - 2.2.0-2 +- Fix two minor issues detected by rpmdiff: installed binaries not stripped + and -tools depended on version not version-release + * Tue Dec 11 2012 Jay Fenlason - 2.2.0-1 - New upstream version From e44797b890103f61b7baeb8aa8b0b441a01fb459 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 00:09:49 -0500 Subject: [PATCH 18/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 4d5c43a..25c6074 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.0 -Release: 2%{?svn_snapshot}%{?dist} +Release: 3%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -116,6 +116,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Jan 29 2013 Jay Fenlason - 2.2.0-2 - Fix two minor issues detected by rpmdiff: installed binaries not stripped and -tools depended on version not version-release From 6d59cc5e00740fb42a16844d92e9ffb336309566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 7 Aug 2013 12:18:58 +0300 Subject: [PATCH 19/52] Install docs using %doc (#993839). --- libdc1394.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 25c6074..5718609 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.0 -Release: 3%{?svn_snapshot}%{?dist} +Release: 4%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -76,8 +76,6 @@ make doc %install %{__rm} -rf %{buildroot} 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} for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do %{__install} -p -m 0644 -s examples/.libs/$p %{buildroot}%{_bindir}/dc1394_$p done @@ -108,7 +106,7 @@ done %files docs %defattr(-, root, root, 0755) -%{_docdir}/%{name}-docs-%{version} +%doc doc/html/* %files tools %defattr(-, root, root, 0755) @@ -116,6 +114,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Aug 7 2013 Ville Skyttä - 2.2.0-4 +- Install docs using %%doc (#993839). + * Sat Aug 03 2013 Fedora Release Engineering - 2.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From efd0310217b6ecea293e78938728b28b88c1fad4 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Thu, 13 Mar 2014 16:02:47 +0100 Subject: [PATCH 20/52] Upgrade to latest stable release 2.2.2 --- .gitignore | 3 +-- libdc1394.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b550c2c..fe5e89d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /.build* /x86_64 -/libdc1394-2.1.4* -/libdc1394-2.2.0.tar.gz +/libdc1394-2.2.2* diff --git a/libdc1394.spec b/libdc1394.spec index 5718609..7b5b99c 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,14 +1,12 @@ -# $Id: libdc1394.spec,v 1.8 2009/09/10 13:31:44 karsten Exp $ #define svn_snapshot .svn459 -#define real_version 2.0.0-rc8%{svn_snapshot} -#%define real_version 2.1.0 +#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.2.0 -Release: 4%{?svn_snapshot}%{?dist} +Version: 2.2.2 +Release: 1%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -114,6 +112,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Mar 13 2014 Tim Niemueller - 2.2.2-1 +- Upgrade to latest stable release 2.2.2 + * Wed Aug 7 2013 Ville Skyttä - 2.2.0-4 - Install docs using %%doc (#993839). @@ -176,7 +177,7 @@ done * Mon Jan 07 2008 Tim Niemueller - 2.0.0-1 - Update to 2.0.0 -* Thu Dec 16 2007 Tim Niemueller - 2.0.0-rc9 +* Sun Dec 16 2007 Tim Niemueller - 2.0.0-rc9 - Update to 2.0.0-rc9 * Wed Nov 28 2007 Tim Niemueller - 2.0.0-rc7.3.svn459 diff --git a/sources b/sources index 833f18a..8801188 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed10e06987c76c79961c6906e02acf00 libdc1394-2.2.0.tar.gz +6544c6abb9ba41840c7d36f95ff4d593 libdc1394-2.2.2.tar.gz From 42100c6221c8a8b2f0f61b16bdcee78e667e7d33 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:02:34 -0500 Subject: [PATCH 21/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 7b5b99c..95247d3 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 1%{?svn_snapshot}%{?dist} +Release: 2%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -112,6 +112,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Mar 13 2014 Tim Niemueller - 2.2.2-1 - Upgrade to latest stable release 2.2.2 From e26f5cbdc2e51b4caff02ef9af0bdbf6f9f4eadf Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:51:56 +0000 Subject: [PATCH 22/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 95247d3..d760f6d 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 2%{?svn_snapshot}%{?dist} +Release: 3%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -112,6 +112,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 2.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 41b34931067a6e3cb3365cd537f6cf25fd0d2b14 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 15:07:14 +0000 Subject: [PATCH 23/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index d760f6d..2b373f2 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 3%{?svn_snapshot}%{?dist} +Release: 4%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -112,6 +112,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 2.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From cec9a7a42540bac3731febe8fa83b5f2d7c261f5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 03:02:39 +0000 Subject: [PATCH 24/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 2b373f2..1a9abd9 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 4%{?svn_snapshot}%{?dist} +Release: 5%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -112,6 +112,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 14f4e50b8c92f6d030021d0ae7d43710901e6ebc Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 21 Dec 2016 14:30:10 -0500 Subject: [PATCH 25/52] Add BR on perl to fix FTBFS on F25+ --- libdc1394.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 1a9abd9..0493b9e 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 5%{?svn_snapshot}%{?dist} +Release: 6%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -17,6 +17,7 @@ ExcludeArch: s390 s390x BuildRequires: kernel-headers BuildRequires: libraw1394-devel libusb1-devel BuildRequires: doxygen +BuildRequires: perl BuildRequires: libX11-devel libXv-devel %if %{svn_build} BuildRequires: libtool @@ -112,6 +113,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Dec 21 2016 Stephen Gallagher - 2.2.2-6 +- Add BR on perl to fix FTBFS on F25+ + * Thu Feb 04 2016 Fedora Release Engineering - 2.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3e0f36d3099ba85afe296def3dabc1525c9ffacc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:31:44 +0000 Subject: [PATCH 26/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 0493b9e..46d2e02 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 6%{?svn_snapshot}%{?dist} +Release: 7%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -113,6 +113,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Dec 21 2016 Stephen Gallagher - 2.2.2-6 - Add BR on perl to fix FTBFS on F25+ From 29acbf29b7108c13d8fc2de56fe3edef326a8c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 15:15:30 +0200 Subject: [PATCH 27/52] perl dependency renamed to perl-interpreter --- libdc1394.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 46d2e02..2362d2e 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -17,7 +17,7 @@ ExcludeArch: s390 s390x BuildRequires: kernel-headers BuildRequires: libraw1394-devel libusb1-devel BuildRequires: doxygen -BuildRequires: perl +BuildRequires: perl-interpreter BuildRequires: libX11-devel libXv-devel %if %{svn_build} BuildRequires: libtool From 51439360fd2870fc7008dade7321b0fe62c5785d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:42:27 +0000 Subject: [PATCH 28/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 2362d2e..121c687 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 7%{?svn_snapshot}%{?dist} +Release: 8%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -113,6 +113,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c9e64c86b04e2c218d3d9fc499ae9dde6a91feaa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:20:22 +0000 Subject: [PATCH 29/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 121c687..fa8e035 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 8%{?svn_snapshot}%{?dist} +Release: 9%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -113,6 +113,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.2.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c0f9fc1da4277112c52d674c04d72fb0517f1b00 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:26:23 +0000 Subject: [PATCH 30/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index fa8e035..8284926 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 9%{?svn_snapshot}%{?dist} +Release: 10%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -113,6 +113,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.2.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a394bb7e1cb63f9e60565d793fb87c35ead057f8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:39:10 +0100 Subject: [PATCH 31/52] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- libdc1394.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 8284926..5e89027 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -11,7 +11,6 @@ License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root ExcludeArch: s390 s390x BuildRequires: kernel-headers From d86a0825b1f02bb22513bb558d7a78028957f4f7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:10:48 +0100 Subject: [PATCH 32/52] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libdc1394.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 5e89027..1dfaba3 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -86,9 +86,6 @@ done %postun -p /sbin/ldconfig -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README From 138e9ad5d5deea9b8db315a7cf8eabfd8bc99d6f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:47 +0200 Subject: [PATCH 33/52] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- libdc1394.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libdc1394.spec b/libdc1394.spec index 1dfaba3..51930a2 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -13,6 +13,7 @@ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz ExcludeArch: s390 s390x +BuildRequires: gcc BuildRequires: kernel-headers BuildRequires: libraw1394-devel libusb1-devel BuildRequires: doxygen From c8b30af8f58c226fb45051aedbe9dfc7d970cc0d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:38:32 -0500 Subject: [PATCH 34/52] Remove needless use of %defattr --- libdc1394.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 51930a2..10662ae 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -88,12 +88,10 @@ done %postun -p /sbin/ldconfig %files -%defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/libdc1394*.so.* %files devel -%defattr(-, root, root, 0755) %doc examples/*.h examples/*.c %{_includedir}/dc1394/ %{_libdir}/libdc1394*.so @@ -101,11 +99,9 @@ done %exclude %{_libdir}/*.la %files docs -%defattr(-, root, root, 0755) %doc doc/html/* %files tools -%defattr(-, root, root, 0755) %{_bindir}/dc1394_* %{_mandir}/man1/dc1394_*.1.gz From f4937b5e9bec05d55bab1f0955bfff0ffb19fba1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:58:28 +0000 Subject: [PATCH 35/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 10662ae..154804c 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 10%{?svn_snapshot}%{?dist} +Release: 11%{?svn_snapshot}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ @@ -106,6 +106,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2.2.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 89eea9636631d3af00f2362202ea116392ea86fe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:38 +0100 Subject: [PATCH 36/52] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libdc1394.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 154804c..4831f1d 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -83,9 +83,7 @@ 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 - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc AUTHORS ChangeLog COPYING NEWS README From bc1abae7c92ac9bb9df075951abfe7a6db8e92cb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:51 +0100 Subject: [PATCH 37/52] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libdc1394.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 4831f1d..7cf6487 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,7 +8,6 @@ Name: libdc1394 Version: 2.2.2 Release: 11%{?svn_snapshot}%{?dist} License: LGPLv2+ -Group: System Environment/Libraries URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz ExcludeArch: s390 s390x @@ -30,7 +29,6 @@ cameras that conform to the 1394-based Digital Camera Specification. %package devel Summary: Header files and libraries for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release}, libraw1394-devel Requires: pkgconfig @@ -41,14 +39,12 @@ you will need to install %{name}-devel. %package docs Summary: Development documentation for %{name} -Group: Documentation %description docs This package contains the development documentation for %{name}. %package tools Summary: Tools for use with %{name} -Group: Applications/System Requires: %{name} = %{version}-%{release} %description tools From 9a7e9b60c654ceb4358bc6574a8a7bfa9da183b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:55:37 +0000 Subject: [PATCH 38/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 7cf6487..b6d7f90 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 11%{?svn_snapshot}%{?dist} +Release: 12%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -100,6 +100,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a8e22b287c01e554653f0e0836ba70ad7a698324 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:03:34 +0000 Subject: [PATCH 39/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index b6d7f90..c006249 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 12%{?svn_snapshot}%{?dist} +Release: 13%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -100,6 +100,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.2.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9c0dce4d4882ca9795f6905ba4c9faf7a331a02c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:53:11 +0000 Subject: [PATCH 40/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index c006249..bb8e0da 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -6,7 +6,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.2 -Release: 13%{?svn_snapshot}%{?dist} +Release: 14%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -100,6 +100,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.2.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a41747f5c2ccb8adb1f0772a004fc56747db8678 Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Tue, 21 Jul 2020 19:18:02 +0200 Subject: [PATCH 41/52] Update to 2.2.6 --- .gitignore | 1 + libdc1394.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe5e89d..76dc2d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.build* /x86_64 /libdc1394-2.2.2* +/libdc1394-2.2.6.tar.gz diff --git a/libdc1394.spec b/libdc1394.spec index bb8e0da..0ba261d 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -5,8 +5,8 @@ Summary: 1394-based digital camera control library Name: libdc1394 -Version: 2.2.2 -Release: 14%{?svn_snapshot}%{?dist} +Version: 2.2.6 +Release: 1%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -100,6 +100,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Tue Jul 21 2020 Till Hofmann - 2.2.6-1 +- Update to 2.2.6 + * Wed Jan 29 2020 Fedora Release Engineering - 2.2.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8801188..c44c3b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6544c6abb9ba41840c7d36f95ff4d593 libdc1394-2.2.2.tar.gz +SHA512 (libdc1394-2.2.6.tar.gz) = 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 From 20e3515e3f80876ff24a3cb3e07b2a51f78d3fdd Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Mon, 27 Jul 2020 21:07:22 +0200 Subject: [PATCH 42/52] Do not glob soversion to avoid accidental bumps --- libdc1394.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 0ba261d..478564a 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,3 +1,4 @@ +%global sover 25 #define svn_snapshot .svn459 #define real_version 2.1.0 @@ -6,7 +7,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.6 -Release: 1%{?svn_snapshot}%{?dist} +Release: 2%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -83,7 +84,7 @@ done %files %doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/libdc1394*.so.* +%{_libdir}/libdc1394*.so.%{sover}* %files devel %doc examples/*.h examples/*.c @@ -100,6 +101,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Mon Jul 27 2020 Till Hofmann - 2.2.6-2 +- Do not glob soversion to avoid accidental bumps + * Tue Jul 21 2020 Till Hofmann - 2.2.6-1 - Update to 2.2.6 From 4ff47aa07c09bb2f1b1710faa16c6e881f3b791a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:28:13 +0000 Subject: [PATCH 43/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 478564a..9c12280 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -7,7 +7,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.6 -Release: 2%{?svn_snapshot}%{?dist} +Release: 3%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -101,6 +101,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Till Hofmann - 2.2.6-2 - Do not glob soversion to avoid accidental bumps From 92dfe4e3917f57832242c7944473873821f0ea5b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 01:02:21 +0000 Subject: [PATCH 44/52] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- libdc1394.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libdc1394.spec b/libdc1394.spec index 9c12280..d323488 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -13,6 +13,7 @@ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz ExcludeArch: s390 s390x +BuildRequires: make BuildRequires: gcc BuildRequires: kernel-headers BuildRequires: libraw1394-devel libusb1-devel From 1e4a1ee4d9f5b4ec94e4eb055c084ee9457ed184 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:53:14 +0000 Subject: [PATCH 45/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index d323488..96ee08a 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -7,7 +7,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.6 -Release: 3%{?svn_snapshot}%{?dist} +Release: 4%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -102,6 +102,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9fe6c4cda9eafe0a44f0f25fc3f9de87c380e74b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:11:18 +0000 Subject: [PATCH 46/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 96ee08a..4cf26bf 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -7,7 +7,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.6 -Release: 4%{?svn_snapshot}%{?dist} +Release: 5%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -102,6 +102,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9237db446a87f177c1dfa17998bc949cab0991e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:00:32 +0000 Subject: [PATCH 47/52] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libdc1394.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libdc1394.spec b/libdc1394.spec index 4cf26bf..5653790 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -7,7 +7,7 @@ Summary: 1394-based digital camera control library Name: libdc1394 Version: 2.2.6 -Release: 5%{?svn_snapshot}%{?dist} +Release: 6%{?svn_snapshot}%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -102,6 +102,9 @@ done %{_mandir}/man1/dc1394_*.1.gz %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9e2c2e70d02e103a66250d5532bb3f581d5be412 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 31 May 2022 17:25:53 +0200 Subject: [PATCH 48/52] Drop svn flags, project is on git now --- libdc1394.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index 5653790..e73ceee 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,13 +1,9 @@ %global sover 25 -#define svn_snapshot .svn459 -#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.2.6 -Release: 6%{?svn_snapshot}%{?dist} +Release: 6%{?dist} License: LGPLv2+ URL: http://sourceforge.net/projects/libdc1394/ Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz @@ -20,9 +16,7 @@ BuildRequires: libraw1394-devel libusb1-devel BuildRequires: doxygen BuildRequires: perl-interpreter BuildRequires: libX11-devel libXv-devel -%if %{svn_build} BuildRequires: libtool -%endif %description Libdc1394 is a library that is intended to provide a high level programming @@ -57,13 +51,10 @@ developing with %{name}. %setup -q -n libdc1394-%{version} %build -%if %{svn_build} -cp /usr/share/libtool/ltmain.sh . aclocal autoheader autoconf automake --add-missing -%endif %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 From 94d0ddc2e4b7e5cd7cbb1e9a3dfe62147182e6e9 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 31 May 2022 17:32:20 +0200 Subject: [PATCH 49/52] SPEC file cleanup --- libdc1394.spec | 253 ++++++++++++++----------------------------------- 1 file changed, 69 insertions(+), 184 deletions(-) diff --git a/libdc1394.spec b/libdc1394.spec index e73ceee..4da4c48 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,98 +1,116 @@ -%global sover 25 - -Summary: 1394-based digital camera control library -Name: libdc1394 -Version: 2.2.6 -Release: 6%{?dist} -License: LGPLv2+ -URL: http://sourceforge.net/projects/libdc1394/ -Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz -ExcludeArch: s390 s390x - -BuildRequires: make +Name: libdc1394 +Summary: 1394-based digital camera control library +Version: 2.2.6 +Release: 7%{?dist} +License: LGPLv2+ +URL: http://sourceforge.net/projects/%{name}/ + +ExcludeArch: s390 s390x + +Source: http://downloads.sourceforge.net/project/%{name}/%{name}-2/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: doxygen BuildRequires: gcc -BuildRequires: kernel-headers -BuildRequires: libraw1394-devel libusb1-devel -BuildRequires: doxygen -BuildRequires: perl-interpreter -BuildRequires: libX11-devel libXv-devel -BuildRequires: libtool +BuildRequires: kernel-headers +BuildRequires: make +BuildRequires: libraw1394-devel +BuildRequires: libtool +BuildRequires: libusb1-devel +BuildRequires: libX11-devel +BuildRequires: libXv-devel +BuildRequires: perl-interpreter %description Libdc1394 is a library that is intended to provide a high level programming -interface for application developers who wish to control IEEE 1394 based -cameras that conform to the 1394-based Digital Camera Specification. +interface for application developers who wish to control IEEE 1394 based cameras +that conform to the 1394-based Digital Camera Specification. %package devel -Summary: Header files and libraries for %{name} -Requires: %{name} = %{version}-%{release}, libraw1394-devel -Requires: pkgconfig +Summary: Header files and libraries for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libraw1394-devel %description devel -This package contains the header files and libraries -for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +This package contains the header files and libraries for %{name}. If you like +to develop programs using %{name}, you will need to install %{name}-devel. %package docs -Summary: Development documentation for %{name} +Summary: Development documentation for %{name} %description docs This package contains the development documentation for %{name}. %package tools -Summary: Tools for use with %{name} -Requires: %{name} = %{version}-%{release} +Summary: Tools for use with %{name} %description tools -This package contains tools that are useful when working and -developing with %{name}. +This package contains tools that are useful when working and developing with +%{name}. %prep -%setup -q -n libdc1394-%{version} +%autosetup %build -aclocal -autoheader -autoconf -automake --add-missing +autoreconf -vif %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} -make doc +%make_build +%make_build doc %install -%{__rm} -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +%make_install + for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do - %{__install} -p -m 0644 -s examples/.libs/$p %{buildroot}%{_bindir}/dc1394_$p + install -p -m 0755 -s examples/.libs/$p %{buildroot}%{_bindir}/dc1394_$p done -%{__install} -p -m 0644 examples/dc1394_multiview %{buildroot}%{_bindir}/dc1394_multiview +install -p -m 0755 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 + mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1 done -%ldconfig_scriptlets +%{?ldconfig_scriptlets} %files -%doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/libdc1394*.so.%{sover}* +%license COPYING +%doc AUTHORS ChangeLog NEWS README +%{_libdir}/%{name}.so.25 +%{_libdir}/%{name}.so.25.0.0 %files devel %doc examples/*.h examples/*.c %{_includedir}/dc1394/ -%{_libdir}/libdc1394*.so +%{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}-2.pc -%exclude %{_libdir}/*.la %files docs %doc doc/html/* %files tools %{_bindir}/dc1394_* -%{_mandir}/man1/dc1394_*.1.gz +%{_bindir}/dc1394_grab_color_image +%{_bindir}/dc1394_grab_gray_image +%{_bindir}/dc1394_grab_partial_image +%{_bindir}/dc1394_grab_partial_pvn +%{_bindir}/dc1394_ladybug +%{_bindir}/dc1394_multiview +%{_bindir}/dc1394_reset_bus +%{_mandir}/man1/dc1394_grab_color_image.* +%{_mandir}/man1/dc1394_grab_gray_image.* +%{_mandir}/man1/dc1394_grab_partial_image.* +%{_mandir}/man1/dc1394_multiview.* +%{_mandir}/man1/dc1394_reset_bus.* +%{_mandir}/man1/dc1394_vloopback.* %changelog +* Tue May 31 2022 Simone Caronni - 2.2.6-7 +- SPEC file cleanup. +- Use proper macros everywhere. +- Fix permissions for binaries. +- Fix rpmlint issues. +- Trim changelog. + * Thu Jan 20 2022 Fedora Release Engineering - 2.2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild @@ -113,136 +131,3 @@ done * Wed Jan 29 2020 Fedora Release Engineering - 2.2.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.2.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.2.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.2.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Dec 21 2016 Stephen Gallagher - 2.2.2-6 -- Add BR on perl to fix FTBFS on F25+ - -* Thu Feb 04 2016 Fedora Release Engineering - 2.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 2.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Mar 13 2014 Tim Niemueller - 2.2.2-1 -- Upgrade to latest stable release 2.2.2 - -* Wed Aug 7 2013 Ville Skyttä - 2.2.0-4 -- Install docs using %%doc (#993839). - -* Sat Aug 03 2013 Fedora Release Engineering - 2.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jan 29 2013 Jay Fenlason - 2.2.0-2 -- Fix two minor issues detected by rpmdiff: installed binaries not stripped - and -tools depended on version not version-release - -* Tue Dec 11 2012 Jay Fenlason - 2.2.0-1 -- New upstream version - -* Thu Jul 19 2012 Fedora Release Engineering - 2.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jan 04 2012 Tim Niemueller - 2.1.4-2 -- Fix improperly installed tools (bz #593873) - -* Wed Jan 04 2012 Tim Niemueller - 2.1.4-1 -- Update to latest stable release 2.1.4 - -* Mon Feb 07 2011 Fedora Release Engineering - 2.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Sep 10 2009 Karsten Hopp 2.1.2-3 -- excludearch s390 s390x where we don't have libraw1394 - -* Fri Jul 24 2009 Fedora Release Engineering - 2.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Tim Niemueller - 2.1.2-1 -- Update to latest stable release 2.1.2 - -* Tue Mar 17 2009 Tim Niemueller - 2.1.0-1 -- Update to latest stable release 2.1.0 - -* Wed Feb 25 2009 Fedora Release Engineering - 2.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon May 12 2008 Tim Niemueller - 2.0.2-1 -- Update to latest stable release 2.0.2 - -* Sat Jan 19 2008 Tim Niemueller - 2.0.1-3 -- Made autotools calls optional, only called if svn_snapshot is defined -- devel subpackage now requires pkgconfig - -* Wed Jan 16 2008 Tim Niemueller - 2.0.1-2 -- Add docs subpackage to contain development documentation -- Incoroprate multilib tricks -- BuildReqire automake, autoconf, libtool and doxygen -- Removed unused BuildRequires -- Use header file from kernel-headers instead of kernel-devel -- BuildRequire kernel-devel -- Added tools subpackage to contain the resetbus and vloopback tools - -* Wed Jan 16 2008 Tim Niemueller - 2.0.1-1 -- Update to 2.0.1, now patent-free! - -* Mon Jan 07 2008 Tim Niemueller - 2.0.0-1 -- Update to 2.0.0 - -* Sun Dec 16 2007 Tim Niemueller - 2.0.0-rc9 -- Update to 2.0.0-rc9 - -* Wed Nov 28 2007 Tim Niemueller - 2.0.0-rc7.3.svn459 -- Updated to release 2.0.0-rc7+svn459 (not yet released) - -* Fri Nov 02 2007 Tim Niemueller - 2.0.0-rc7.1.svn443 -- Updated to release 2.0.0-rc7+svn443 (not yet released) for juju support -- Added --without juju to disable juju support (necessary for FC6) - -* Fri Feb 02 2007 Tim Niemueller - 2.0.0-rc5.1 -- Updated to release 2.0.0-rc5. - -* Wed Aug 16 2006 Tim Niemueller - 2.0.0-rc3.1 -- Updated to release 2.0.0-rc3. - -* Mon May 08 2006 Dries Verachtert - 2.0.0-0.1.pre7 -- Updated to release 2.0.0-0.1.pre7. - -* Sat Apr 08 2006 Dries Verachtert - 2.0.0-0.1.pre5.2 -- Rebuild for Fedora Core 5. - -* Thu Dec 8 2005 Matthias Saou 2.0.0-0.1.pre5 -- Update to 2.0.0-pre5. -- Add missing libraw1394-devel dependency to the devel package. - -* Tue Aug 30 2005 Dries Verachtert - 2.0.0-0.pre4 -- Update to release 2.0.0-0.pre4. - -* Thu Aug 25 2005 Dries Verachtert - 1.1.0-1 -- Initial package. From 49fd6166fec3a5c16059e7037a466cc89a9aec98 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 31 May 2022 18:20:40 +0200 Subject: [PATCH 50/52] Fix build --- libdc1394-sdl.patch | 23 +++++++++++++++++++++++ libdc1394.spec | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 libdc1394-sdl.patch diff --git a/libdc1394-sdl.patch b/libdc1394-sdl.patch new file mode 100644 index 0000000..f3c584b --- /dev/null +++ b/libdc1394-sdl.patch @@ -0,0 +1,23 @@ +diff -Naur libdc1394-2.2.6.old/configure.ac libdc1394-2.2.6/configure.ac +--- libdc1394-2.2.6.old/configure.ac 2022-05-31 18:11:17.320426983 +0200 ++++ libdc1394-2.2.6/configure.ac 2022-05-31 18:11:32.882714398 +0200 +@@ -45,12 +45,6 @@ + [AC_DEFINE(HAVE_LIBUSB,[],[Defined if libusb is present])], + [AC_MSG_WARN([libusb-1.0 not found])]) + +-MIN_SDL_VERSION=1.2.4 +-AH_TEMPLATE(HAVE_LIBSDL, [SDL library]) +-AM_PATH_SDL($MIN_SDL_VERSION, [AC_DEFINE(HAVE_LIBSDL) HAVE_LIBSDL="yes"]) +-AC_SUBST(SDL_CFLAGS) +-AC_SUBST(SDL_LIBS) +- + case "$host" in + *-*-linux*) + have_linux=true +@@ -233,4 +227,4 @@ + Build V4L examples: ${VIDEXAMPLESMSG}" + fi + dnl extra newline: +-echo "" +\ No newline at end of file ++echo "" diff --git a/libdc1394.spec b/libdc1394.spec index 4da4c48..afbef8b 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -8,6 +8,7 @@ URL: http://sourceforge.net/projects/%{name}/ ExcludeArch: s390 s390x Source: http://downloads.sourceforge.net/project/%{name}/%{name}-2/%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-sdl.patch BuildRequires: autoconf BuildRequires: automake @@ -50,7 +51,7 @@ This package contains tools that are useful when working and developing with %{name}. %prep -%autosetup +%autosetup -p1 %build autoreconf -vif @@ -88,7 +89,6 @@ done %doc doc/html/* %files tools -%{_bindir}/dc1394_* %{_bindir}/dc1394_grab_color_image %{_bindir}/dc1394_grab_gray_image %{_bindir}/dc1394_grab_partial_image From 739e69a68c6226d6aa6fb2052a56b43b6c725edd Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 31 May 2022 20:07:53 +0200 Subject: [PATCH 51/52] f34/35 install also the local archive --- libdc1394.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libdc1394.spec b/libdc1394.spec index afbef8b..56a6a74 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -71,6 +71,8 @@ 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 +find %{buildroot} -name "*.la" -delete + %{?ldconfig_scriptlets} %files From ad3ac7d94f3ca3dd39f03be03d7b3c2db0b83f92 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:01:02 +0300 Subject: [PATCH 52/52] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index c44c3b8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (libdc1394-2.2.6.tar.gz) = 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25