Hello community, here is the log from the commit of package libdc1394 for openSUSE:Factory checked in at Mon Aug 29 15:25:28 CEST 2011. -------- --- libdc1394/libdc1394.changes 2011-07-07 11:50:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/libdc1394/libdc1394.changes 2011-08-29 10:04:17.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 29 08:03:27 UTC 2011 - idonmez@suse.com + +- Add libdc1394-visibility.patch to properly hide internal symbols + to prevent potential clashes with other libraries, sf #3361405 , + bko # 268267 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libdc1394-visibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdc1394.spec ++++++ --- /var/tmp/diff_new_pack.McmsPy/_old 2011-08-29 15:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.McmsPy/_new 2011-08-29 15:24:27.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # if Build_12 is equal to 0 don't build version 1.2.2 %define Build_12 0 @@ -26,19 +25,18 @@ BuildRequires: libraw1394-devel %if 0%{?suse_version} > 1100 # no IIDC-over-USB support for openSUSE 11.0 -BuildRequires: libusb-1_0-devel pkg-config +BuildRequires: libusb-1_0-devel +BuildRequires: pkg-config %endif %if 0%{?suse_version} >= 1210 BuildRequires: libv4l-devel >= 0.8.4 %endif -License: LGPLv2.1+ -Group: Hardware/Camera -AutoReqProv: on Version: %{libdc1394_version} -Release: 25 -Url: http://sourceforge.net/projects/libdc1394/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Release: 27 +License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library +Url: http://sourceforge.net/projects/libdc1394/ +Group: Hardware/Camera Source1: libdc1394-%{libdc1394_12_version}.tar.bz2 Source2: libdc1394-%{libdc1394_version}.tar.bz2 Source3: %{name}-rpmlintrc @@ -47,6 +45,8 @@ Patch2: libdc1394-swab_fix.patch Patch3: libdc1394.raw1394_set_iso_handler.patch Patch4: libdc1394-v4l-2.6.38.patch +Patch5: libdc1394-visibility.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library provides functionality for controlling any camera that @@ -54,75 +54,38 @@ the low-level functionality provided by libraw1394 to communicate with the camera. - - -Authors: --------- - Gord Peters <GordPeters@smarttech.com> - Per Dalgas Jakobsen <pdj@maridan.dk> - Chris Urmson <curmson@ri.cmu.edu> - Damien Douxchamps <douxchamps@ieee.org> - Dan Dennedy <dan@dennedy.org> - David Moore <david@startbox.com> - John Stanley <stanley@peak.org> - - %if %{Build_12} >= 1 %package -n libdc1394_control12 +Version: %{libdc1394_12_version} +Release: 22 License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera -Version: %{libdc1394_12_version} -Release: 21 %description -n libdc1394_control12 This library provides functionality for controlling any camera that conforms to the 1394-Based Digital Camera Specification (which can be -found at -http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf) -. It utilizes the low-level functionality provided by libraw1394 to +found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf). +It utilizes the low-level functionality provided by libraw1394 to communicate with the camera. - - -Authors: --------- - Gord Peters <GordPeters@smarttech.com> - Per Dalgas Jakobsen <pdj@maridan.dk> - Chris Urmson <curmson@ri.cmu.edu> - Damien Douxchamps <douxchamps@ieee.org> - Dan Dennedy <dan@dennedy.org> - David Moore <david@startbox.com> - John Stanley <stanley@peak.org> - %package -n libdc1394_control12-devel +Version: %{libdc1394_12_version} +Release: 22 License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Development/Libraries/C and C++ -Version: %{libdc1394_12_version} -Release: 21 -Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel +Requires: libdc1394_control12 = %{libdc1394_12_version} +Requires: libraw1394-devel %description -n libdc1394_control12-devel This library provides functionality for controlling any camera that conforms to the 1394-Based Digital Camera Specification (which can be -found at -http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf) -. It utilizes the low-level functionality provided by libraw1394 to +found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf). +It utilizes the low-level functionality provided by libraw1394 to communicate with the camera. - - -Authors: --------- - Gord Peters <GordPeters@smarttech.com> - Per Dalgas Jakobsen <pdj@maridan.dk> - Chris Urmson <curmson@ri.cmu.edu> - Damien Douxchamps <douxchamps@ieee.org> - Dan Dennedy <dan@dennedy.org> - David Moore <david@startbox.com> - John Stanley <stanley@peak.org> %endif %package 22 @@ -133,47 +96,22 @@ %description 22 This library provides functionality for controlling any camera that conforms to the 1394-Based Digital Camera Specification (which can be -found at -http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf) -. It utilizes the low-level functionality provided by libraw1394 to +found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf). +It utilizes the low-level functionality provided by libraw1394 to communicate with the camera. - - -Authors: --------- - Gord Peters <GordPeters@smarttech.com> - Per Dalgas Jakobsen <pdj@maridan.dk> - Chris Urmson <curmson@ri.cmu.edu> - Damien Douxchamps <douxchamps@ieee.org> - Dan Dennedy <dan@dennedy.org> - David Moore <david@startbox.com> - John Stanley <stanley@peak.org> - %package devel License: LGPLv2.1+ Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ -Requires: libdc1394-22 = %{libdc1394_version} Requires: libdc1394 = %{libdc1394_version} +Requires: libdc1394-22 = %{libdc1394_version} Requires: libraw1394-devel %description devel This package contains the header files and libraries for building programs using the dc1394 library. - - -Authors: --------- - Gord Peters <GordPeters@smarttech.com> - Per Dalgas Jakobsen <pdj@maridan.dk> - Chris Urmson <curmson@ri.cmu.edu> - Damien Douxchamps <douxchamps@ieee.org> - Dan Dennedy <dan@dennedy.org> - David Moore <david@startbox.com> - John Stanley <stanley@peak.org> - %prep %setup -q -T -c -a 1 -a 2 %patch0 -p1 @@ -183,14 +121,15 @@ %if 0%{?suse_version} >= 1210 %patch4 %endif +%patch5 %build doit() { if pushd "$1" ; then autoreconf --force --install - export CFLAGS="$RPM_OPT_FLAGS" + export CFLAGS="%{optflags}" %{configure} --disable-static --with-pic --disable-xv - %{__make} %{?jobs:-j%jobs} + make %{?_smp_mflags} popd fi } @@ -202,7 +141,7 @@ %install doit() { if pushd "$1" ; then - %{__make} DESTDIR=${RPM_BUILD_ROOT} install + make DESTDIR=%{buildroot} install popd fi } @@ -213,7 +152,7 @@ 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 +rm -f %{buildroot}%{_libdir}/*.la %if %{Build_12} >= 1 @@ -229,29 +168,29 @@ %files %defattr(-,root,root) %doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README} -%_bindir/dc1394_reset_bus +%{_bindir}/dc1394_reset_bus %{_mandir}/man1/dc1394_reset_bus.1* %files 22 %defattr(-,root,root) -%_libdir/libdc1394.so.22* +%{_libdir}/libdc1394.so.22* %if %{Build_12} >= 1 %files -n libdc1394_control12 %defattr(-,root,root) -%_libdir/libdc1394_control.so.* +%{_libdir}/libdc1394_control.so.* %files -n libdc1394_control12-devel %defattr(-,root,root) -%_includedir/libdc1394 -%_libdir/libdc1394_control*.so +%{_includedir}/libdc1394 +%{_libdir}/libdc1394_control*.so %endif %files devel %defattr(-,root,root) -%_includedir/dc1394 -%_libdir/libdc1394.so -%_libdir/pkgconfig/*.pc +%{_includedir}/dc1394 +%{_libdir}/libdc1394.so +%{_libdir}/pkgconfig/*.pc %changelog ++++++ libdc1394-visibility.patch ++++++ ++++ 2756 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org