Hello community, here is the log from the commit of package taglib for openSUSE:Factory checked in at 2019-07-13 13:48:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/taglib (Old) and /work/SRC/openSUSE:Factory/.taglib.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "taglib" Sat Jul 13 13:48:38 2019 rev:54 rq:714024 version:1.11.1+git20190531.ba7adc2b Changes: -------- --- /work/SRC/openSUSE:Factory/taglib/taglib.changes 2019-06-13 22:29:08.692463171 +0200 +++ /work/SRC/openSUSE:Factory/.taglib.new.4615/taglib.changes 2019-07-13 14:00:26.570897168 +0200 @@ -1,0 +2,18 @@ +Mon Jul 8 09:06:19 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Switch to service file for generating the package +- Use conditions to enable the multibuild tests in other loop while + also generating the docs +- Make sure the tests are actually executed + +------------------------------------------------------------------- +Thu Jul 4 18:04:10 UTC 2019 - Stefan Brüns <[email protected]> + +- Split API documentation from devel package, and convert it to multibuild + - API documentation is significantly larger than library and headers + - API documentation is noarch + - Significantly reduced dependency chain for the library package +- Use graphviz-gd instead of graphviz-gnome for API docs +- Cleanup specfile + +------------------------------------------------------------------- Old: ---- taglib-1.11.2~git20190601.tar.gz New: ---- _multibuild _service taglib-1.11.1+git20190531.ba7adc2b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taglib.spec ++++++ --- /var/tmp/diff_new_pack.Pphaz4/_old 2019-07-13 14:00:27.490896886 +0200 +++ /var/tmp/diff_new_pack.Pphaz4/_new 2019-07-13 14:00:27.490896886 +0200 @@ -16,33 +16,44 @@ # -%define rev ba7adc2bc261ed634c2a964185bcffb9365ad2f4 - -Name: taglib -Version: 1.11.2~git20190601 +%global flavor @BUILD_FLAVOR@%{nil} +%global sname taglib +%if "%{flavor}" != "" +%global psuffix -%{flavor} +# build also examples with tests +%bcond_without tests +%else +%global psuffix %{nil} +%bcond_with tests +%endif +Name: taglib%{psuffix} +Version: 1.11.1+git20190531.ba7adc2b Release: 0 Summary: Audio Meta-Data Library License: LGPL-2.1-or-later AND MPL-1.1 Group: Productivity/Multimedia/Other URL: http://taglib.github.io/ -Source0: https://github.com/taglib/taglib/archive/%{rev}.tar.gz#/%{name}-%{version}.tar.gz -#Source0: http://taglib.github.io/releases/%%{name}-%%{version}.tar.gz -Source1: %{name}.desktop +Source0: %{sname}-%{version}.tar.xz +Source1: %{sname}.desktop Source100: baselibs.conf Patch0: taglib-versionbump.patch BuildRequires: cmake >= 2.8 -BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: graphviz-gnome -BuildRequires: libcppunit-devel BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: pkgconfig(zlib) # NOTE: The tagreader and writer executables give different results when built with # an earlier taglib-1.8-ds-rusxmms patch. See bnc#814814 Requires: libtag1 = %{version}-%{release} Requires: libtag_c0 = %{version}-%{release} +%if %{with tests} +BuildRequires: doxygen +BuildRequires: ghostscript-fonts-std +BuildRequires: graphviz-gd +BuildRequires: libcppunit-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +%endif %description TagLib is a library for reading and editing the meta-data of several popular @@ -91,68 +102,88 @@ %description -n libtag-devel This package contains development files for taglib. +%package -n libtag-doc +Summary: API documentation for taglib +License: LGPL-2.1-or-later +Group: Documentation/HTML +BuildArch: noarch + +%description -n libtag-doc +This package contains the taglib API Documentation in HTML format. + %prep -%setup -q -n %{name}-%{rev} -%patch0 -p0 +%setup -q -n %{sname}-%{version} +%patch0 %build +# The testing needs static libs too %cmake \ - -DBUILD_TESTS:BOOL=ON \ -DWITH_ASF:BOOL=ON \ -DWITH_MP4:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON -make %{?_smp_mflags} all docs +%if %{with tests} + -DBUILD_TESTS:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=ON \ + -DBUILD_STATIC_LIBS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=OFF +%else + -DBUILD_TESTS:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF +%endif +%cmake_build + +%if %{with tests} +%cmake_build docs +%endif %install -%cmake_install - +%if %{with tests} # install susehelp file mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ -%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%{name}.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%{sname}.desktop # Documentation -mkdir -p %{buildroot}%{_defaultdocdir}/libtag-devel -rm -f examples/CMake* -cp -a AUTHORS NEWS build/doc/html/ examples/ %{buildroot}%{_defaultdocdir}/libtag-devel/ - -# Add built examples to taglib package. -mkdir -p %{buildroot}%{_bindir} -for i in `find build/examples -maxdepth 1 ! -type d -executable`; do cp -v ${i} %{buildroot}%{_bindir}/; done +mkdir -p %{buildroot}%{_defaultdocdir}/libtag-doc +# Copy manually, otherwise fdupes does not work +cp -a build/doc/html/ %{buildroot}%{_defaultdocdir}/libtag-doc/ +%else +%cmake_install +%endif %fdupes %{buildroot} -%post -%desktop_database_post - -%postun -%desktop_database_postun +%check +%if %{with tests} +%ctest +%endif +%if !%{with tests} %post -n libtag1 -p /sbin/ldconfig %postun -n libtag1 -p /sbin/ldconfig %post -n libtag_c0 -p /sbin/ldconfig %postun -n libtag_c0 -p /sbin/ldconfig %files -n libtag1 +%license COPYING.LGPL COPYING.MPL %{_libdir}/libtag.so.1 %{_libdir}/libtag.so.1.* %files -n libtag_c0 +%license COPYING.LGPL COPYING.MPL %{_libdir}/libtag_c.so.0 %{_libdir}/libtag_c.so.0.* %files -n libtag-devel -%doc %{_defaultdocdir}/libtag-devel %{_bindir}/taglib-config %{_includedir}/taglib/ %{_libdir}/libtag*.so %{_libdir}/pkgconfig/*.pc +%else +%files -n libtag-doc +%doc AUTHORS NEWS examples +%{_docdir}/libtag-doc/html %{_datadir}/susehelp/ - -%files -%license COPYING.LGPL COPYING.MPL -%{_bindir}/* -%exclude %{_bindir}/taglib-config +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>tests</package> </multibuild> ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="version">1.11.1</param> <param name="versionformat">1.11.1+git%cd.%h</param> <param name="url">https://github.com/taglib/taglib.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="changesgenerate">enable</param> <param name="filename">taglib</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> <service name="set_version" mode="disabled"/> </services>
