diff --git a/libdc1394.changes b/libdc1394.changes index 411f2fd..ef319c8 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 4 16:17:07 UTC 2010 - davejplater@gmail.com + +- Version 1.2.2 no longer builds with libraw1394-2.0.5 so sub packages + libdc1394_control12 and libdc1394_control12-devel are no longer + provided. See entry for Tue Aug 15 14:10:33 CEST 2006. + ------------------------------------------------------------------- Sun Dec 27 19:06:15 MSK 2009 - matwey.kornilov@gmail.com diff --git a/libdc1394.spec b/libdc1394.spec index a527659..1f9ad73 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,7 +1,7 @@ # # spec file for package libdc1394 (Version 2.1.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,8 @@ # norootforbuild +# if Build_12 is equal to 0 don't build version 1.2.2 +%define Build_12 0 Name: libdc1394 %define libdc1394_12_version 1.2.2 @@ -30,7 +32,7 @@ License: LGPLv2.1+ Group: Hardware/Camera AutoReqProv: on Version: %{libdc1394_version} -Release: 1 +Release: 17 Url: http://sourceforge.net/projects/libdc1394/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: 1394-Based Digital Camera Control Library @@ -60,12 +62,15 @@ Authors: David Moore John Stanley + +%if %{Build_12} >= 1 + %package -n libdc1394_control12 License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera Version: %{libdc1394_12_version} -Release: 9 +Release: 17 %description -n libdc1394_control12 This library provides functionality for controlling any camera that @@ -92,7 +97,7 @@ License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Development/Libraries/C and C++ Version: %{libdc1394_12_version} -Release: 9 +Release: 17 Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel %description -n libdc1394_control12-devel @@ -114,6 +119,7 @@ Authors: Dan Dennedy David Moore John Stanley +%endif %package 22 License: LGPLv2.1+ @@ -180,7 +186,9 @@ doit() { popd fi } +%if %{Build_12} >= 1 doit libdc1394-%{libdc1394_12_version} +%endif doit libdc1394-%{libdc1394_version} %install @@ -190,16 +198,21 @@ doit() { popd fi } +%if %{Build_12} >= 1 doit libdc1394-%{libdc1394_12_version} +%endif doit libdc1394-%{libdc1394_version} rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1* rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* %{__rm} -f %{buildroot}%{_libdir}/*.la +%if %{Build_12} >= 1 + %post -n libdc1394_control12 -p /sbin/ldconfig %postun -n libdc1394_control12 -p /sbin/ldconfig +%endif %post 22 -p /sbin/ldconfig @@ -213,7 +226,9 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* %files 22 %defattr(-,root,root) -%_libdir/libdc1394.so.* +%_libdir/libdc1394.so.22* + +%if %{Build_12} >= 1 %files -n libdc1394_control12 %defattr(-,root,root) @@ -223,6 +238,7 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* %defattr(-,root,root) %_includedir/libdc1394 %_libdir/libdc1394_control*.so +%endif %files devel %defattr(-,root,root)