diff --git a/libdc1394.changes b/libdc1394.changes index ef319c8..411f2fd 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -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 de36b86..a527659 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -18,10 +18,6 @@ # norootforbuild -# 1.2.2 doesn't build with updated libraw1394 use the following macro to enable it. -# 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 %define libdc1394_version 2.1.2 @@ -64,8 +60,6 @@ Authors: David Moore John Stanley - -%if %{Build_12} >= 1 %package -n libdc1394_control12 License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library @@ -120,7 +114,6 @@ Authors: Dan Dennedy David Moore John Stanley -%endif %package 22 License: LGPLv2.1+ @@ -187,9 +180,7 @@ doit() { popd fi } -%if %{Build_12} >= 1 doit libdc1394-%{libdc1394_12_version} -%endif doit libdc1394-%{libdc1394_version} %install @@ -199,20 +190,16 @@ 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 @@ -226,9 +213,8 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* %files 22 %defattr(-,root,root) -%_libdir/libdc1394.so.22* +%_libdir/libdc1394.so.* -%if %{Build_12} >= 1 %files -n libdc1394_control12 %defattr(-,root,root) %_libdir/libdc1394_control.so.* @@ -237,7 +223,6 @@ rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* %defattr(-,root,root) %_includedir/libdc1394 %_libdir/libdc1394_control*.so -%endif %files devel %defattr(-,root,root)