Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at Wed Nov 3 10:57:48 CET 2010. -------- --- ffado/ffado.changes 2010-11-01 11:08:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/ffado/ffado.changes 2010-11-02 21:37:17.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 2 20:36:45 UTC 2010 - coolo@novell.com + +- move doc generation into 2nd spec file + +------------------------------------------------------------------- +Tue Nov 2 15:31:51 UTC 2010 - davejplater@gmail.com + +- Fix some rpmlint errors + +------------------------------------------------------------------- ffado-mixer.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.KScCGl/_old 2010-11-03 10:56:10.000000000 +0100 +++ /var/tmp/diff_new_pack.KScCGl/_new 2010-11-03 10:56:10.000000000 +0100 @@ -25,7 +25,7 @@ Name: ffado-mixer %define tname libffado Version: 2.0.1 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Multimedia/Other Summary: FireWire 1394 support for audio devices, svn snapshot @@ -57,6 +57,17 @@ mixed audio-control devices to DSP algorithm devices. This is a snapshot of svn revision 1855 +%package -n ffado-doc +License: GPLv2+ +Summary: API documentation for ffado +Group: Documentation/HTML +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif + +%description -n ffado-doc +This package contains the libffado API documentation. + %prep %setup -n %{tname}-%{version} -q @@ -77,6 +88,16 @@ rm -rf %{buildroot} scons DESTDIR=%{buildroot} \ install + +# Build API documentation +export top_srcdir=$PWD +pushd doc +doxygen -u reference.doxygen.in +doxygen reference.doxygen.in +mkdir -p %{buildroot}%{_docdir}/%{tname} +cp -r reference %{buildroot}%{_docdir}/%{tname} +popd + mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ rm %{buildroot}%_libdir/%tname.* rm -r %{buildroot}/usr/include/libffado @@ -111,4 +132,8 @@ %{_datadir}/pixmaps/ffadomixer.png %{_datadir}/applications/* +%files -n ffado-doc +%defattr(-,root,root) +%{_docdir}/%{tname} + %changelog ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.KScCGl/_old 2010-11-03 10:56:10.000000000 +0100 +++ /var/tmp/diff_new_pack.KScCGl/_new 2010-11-03 10:56:10.000000000 +0100 @@ -25,7 +25,7 @@ Name: ffado %define tname libffado Version: 2.0.1 -Release: 2 +Release: 3 License: GPLv2+ Group: Productivity/Multimedia/Other Summary: FireWire 1394 support for audio devices, svn snapshot @@ -33,11 +33,11 @@ Source0: %{tname}-%{version}.tar.bz2 Source1: baselibs.conf Source2: ChangeLog -#Source3: %{_svn}.log +#Source3: %%{_svn}.log BuildRequires: libavc1394-devel libraw1394-devel >= 1.3.0 libxml++-devel scons -BuildRequires: doxygen libexpat-devel pkg-config update-desktop-files xdg-utils +BuildRequires: libexpat-devel pkg-config update-desktop-files xdg-utils BuildRequires: alsa-devel dbus-1-devel >= 1.0 fdupes gcc-c++ libiec61883-devel >= 1.1.0 -BuildRequires: dbus-1-python-devel graphviz-gnome xorg-x11-fonts +BuildRequires: dbus-1-python-devel Requires: libffado2 = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} @@ -84,17 +84,6 @@ a GUI to control these parameters (only for officially supported devices). -%package doc -License: GPLv2+ -Summary: API documentation for ffado -Group: Documentation/HTML -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif - -%description doc -This package contains the libffado API documentation. - %prep %setup -n %{tname}-%{version} -q @@ -115,22 +104,13 @@ rm -rf %{buildroot} scons DESTDIR=%{buildroot} \ install -#mv %{buildroot}%{_datadir}/%{tname}/icons %{buildroot}%{_datadir}/ - -# Build API documentation -export top_srcdir=$PWD -pushd doc -doxygen -u reference.doxygen.in -doxygen reference.doxygen.in -mkdir -p %{buildroot}%{_docdir}/%{name} -cp -r reference %{buildroot}%{_docdir}/%{name} -popd +#mv %%{buildroot}%%{_datadir}/%%{tname}/icons %%{buildroot}%%{_datadir}/ chmod 755 %{buildroot}%{_datadir}/%{tname}/python/ffado_diag_helpers.py chmod 755 %{buildroot}%{_datadir}/%{tname}/python/helpstrings.py cp %{S:2} ./ -#cp %{S:3} ./ +#cp %%{S:3} ./ # NEWS and TODO are zero length find ./ -empty -delete %fdupes -s %{buildroot}%{_datadir} @@ -154,14 +134,10 @@ %{_includedir}/%{tname}/*.h %{_libdir}/%{tname}*.so %{_libdir}/pkgconfig/%{tname}.pc -#%{_datadir}/applnk/ffado.org-ffadomixer.desktop +# %%{_datadir}/applnk/ffado.org-ffadomixer.desktop %files -n libffado2 %defattr(-,root,root) %{_libdir}/%{tname}.so.2* -%files doc -%defattr(-,root,root) -%{_docdir}/%{name} - %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org