1.1 --- a/libdc1394/libdc1394.spec Fri Mar 11 21:30:26 2011 +0100
1.2 +++ b/libdc1394/libdc1394.spec Fri Mar 11 21:36:51 2011 +0100
1.3 @@ -1,28 +1,19 @@
1.4 -# $Id$
1.5 -
1.6 -#define svn_snapshot .svn459
1.7 -#define real_version 2.0.0-rc8%{svn_snapshot}
1.8 -#%define real_version 2.1.0
1.9 -%define svn_build %{?svn_snapshot:1}%{!?svn_snapshot:0}
1.10 -
1.11 -Summary: 1394-based digital camera control library
1.12 -Name: libdc1394
1.13 -Version: 2.1.2
1.14 -Release: 3%{?svn_snapshot}%{?dist}
1.15 -License: LGPLv2+
1.16 -Group: System Environment/Libraries
1.17 -URL: http://sourceforge.net/projects/libdc1394/
1.18 -Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz
1.19 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.20 -ExcludeArch: s390 s390x
1.21 -
1.22 -BuildRequires: kernel-headers
1.23 -BuildRequires: libraw1394-devel libusb1-devel
1.24 -BuildRequires: doxygen
1.25 -BuildRequires: libX11-devel libXv-devel
1.26 -%if %{svn_build}
1.27 -BuildRequires: libtool
1.28 -%endif
1.29 +Name: libdc1394
1.30 +Summary: 1394-based digital camera control library
1.31 +Vendor: Europalab Software
1.32 +Packager: Michael Schloh von Bennewitz
1.33 +Distribution: MeeGo Thirdparty
1.34 +Version: 2.1.2
1.35 +Release: 20101201
1.36 +License: LGPLv2+
1.37 +Group: System Environment/Libraries
1.38 +URL: http://sourceforge.net/projects/libdc1394/
1.39 +Source: http://dl.sf.net/libdc1394/libdc1394-%{version}.tar.gz
1.40 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.41 +BuildRequires: kernel-headers
1.42 +BuildRequires: libraw1394-devel libusb1-devel
1.43 +BuildRequires: libX11-devel libXv-devel
1.44 +BuildRequires: doxygen
1.45
1.46 %description
1.47 Libdc1394 is a library that is intended to provide a high level programming
1.48 @@ -30,10 +21,13 @@
1.49 cameras that conform to the 1394-based Digital Camera Specification.
1.50
1.51 %package devel
1.52 -Summary: Header files and libraries for %{name}
1.53 -Group: Development/Libraries
1.54 -Requires: %{name} = %{version}-%{release}, libraw1394-devel
1.55 -Requires: pkgconfig
1.56 +Summary: Header files and libraries for %{name}
1.57 +Vendor: Europalab Software
1.58 +Packager: Michael Schloh von Bennewitz
1.59 +Distribution: MeeGo Thirdparty
1.60 +Group: Development/Libraries
1.61 +Requires: %{name} = %{version}-%{release}
1.62 +Requires: pkgconfig, libraw1394-devel
1.63
1.64 %description devel
1.65 This package contains the header files and libraries
1.66 @@ -42,14 +36,20 @@
1.67
1.68 %package docs
1.69 Summary: Development documentation for %{name}
1.70 -Group: Documentation
1.71 +Vendor: Europalab Software
1.72 +Packager: Michael Schloh von Bennewitz
1.73 +Distribution: MeeGo Thirdparty
1.74 +Group: Documentation
1.75
1.76 %description docs
1.77 This package contains the development documentation for %{name}.
1.78
1.79 %package tools
1.80 -Summary: Tools for use with %{name}
1.81 -Group: Applications/System
1.82 +Summary: Tools for use with %{name}
1.83 +Vendor: Europalab Software
1.84 +Packager: Michael Schloh von Bennewitz
1.85 +Distribution: MeeGo Thirdparty
1.86 +Group: Applications/System
1.87 Requires: %{name} = %{version}
1.88
1.89 %description tools
1.90 @@ -60,14 +60,7 @@
1.91 %setup -q -n libdc1394-%{version}
1.92
1.93 %build
1.94 -%if %{svn_build}
1.95 -cp /usr/share/libtool/ltmain.sh .
1.96 -aclocal
1.97 -autoheader
1.98 -autoconf
1.99 -automake --add-missing
1.100 -%endif
1.101 -%configure --disable-static --enable-doxygen-html --enable-doxygen-dot
1.102 +%configure --enable-doxygen-html --enable-doxygen-dot
1.103 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
1.104 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
1.105 make %{?_smp_mflags}
1.106 @@ -75,15 +68,15 @@
1.107
1.108 %install
1.109 %{__rm} -rf %{buildroot}
1.110 -make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
1.111 +make install DESTDIR=%{buildroot}
1.112 mkdir -p %{buildroot}%{_docdir}/%{name}-docs-%{version}
1.113 %{__install} -p -m 0644 doc/html/* %{buildroot}%{_docdir}/%{name}-docs-%{version}
1.114 for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do
1.115 - %{__install} -p -m 0644 examples/$p %{buildroot}%{_bindir}/dc1394_$p
1.116 + %{__install} -p -m 0644 examples/$p %{buildroot}%{_bindir}/dc1394_$p
1.117 done
1.118 %{__install} -p -m 0644 examples/dc1394_multiview %{buildroot}%{_bindir}/dc1394_multiview
1.119 for f in grab_color_image grab_gray_image grab_partial_image; do
1.120 - mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1
1.121 + mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1
1.122 done
1.123
1.124 %post -p /sbin/ldconfig
1.125 @@ -102,9 +95,10 @@
1.126 %defattr(-, root, root, 0755)
1.127 %doc examples/*.h examples/*.c
1.128 %{_includedir}/dc1394/
1.129 +%{_libdir}/libdc1394*.a
1.130 +%{_libdir}/libdc1394*.la
1.131 %{_libdir}/libdc1394*.so
1.132 %{_libdir}/pkgconfig/%{name}-2.pc
1.133 -%exclude %{_libdir}/*.la
1.134
1.135 %files docs
1.136 %defattr(-, root, root, 0755)
1.137 @@ -116,6 +110,9 @@
1.138 %{_mandir}/man1/dc1394_*.1.gz
1.139
1.140 %changelog
1.141 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 2.1.2-20101201
1.142 +- Adjust packaging and patch logic
1.143 +
1.144 * Fri Oct 29 2010 Kozinov Ivan <kozinov@gmail.com> - 2.1.2-3
1.145 - Build for 1.1
1.146
