From 7b2471683fce4536b6056b89331afec75854599cf2dc53830d5d229c1229c46f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 15 Jul 2019 07:59:36 +0000 Subject: [PATCH] Revert to old rev - this was never ready OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/taglib?expand=0&rev=55 --- _multibuild | 3 - _service | 16 ---- taglib-1.11.1+git20190531.ba7adc2b.tar.xz | 3 - taglib-1.11.2~git20190601.tar.gz | 3 + taglib.changes | 18 ---- taglib.spec | 105 ++++++++-------------- 6 files changed, 40 insertions(+), 108 deletions(-) delete mode 100644 _multibuild delete mode 100644 _service delete mode 100644 taglib-1.11.1+git20190531.ba7adc2b.tar.xz create mode 100644 taglib-1.11.2~git20190601.tar.gz diff --git a/_multibuild b/_multibuild deleted file mode 100644 index 0bc293a..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - tests - diff --git a/_service b/_service deleted file mode 100644 index ad055ab..0000000 --- a/_service +++ /dev/null @@ -1,16 +0,0 @@ - - - 1.11.1 - 1.11.1+git%cd.%h - https://github.com/taglib/taglib.git - git - .git - enable - taglib - - - xz - *.tar - - - diff --git a/taglib-1.11.1+git20190531.ba7adc2b.tar.xz b/taglib-1.11.1+git20190531.ba7adc2b.tar.xz deleted file mode 100644 index a5aa361..0000000 --- a/taglib-1.11.1+git20190531.ba7adc2b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f5bd0a3525a50d22638d019f85130490a26a67e4ec4caf57d1774cb5192f69a -size 902668 diff --git a/taglib-1.11.2~git20190601.tar.gz b/taglib-1.11.2~git20190601.tar.gz new file mode 100644 index 0000000..3f7ead4 --- /dev/null +++ b/taglib-1.11.2~git20190601.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ca08920a9a7e8ef5fc1bbb235aecea37ba63cd2025695b08cd7d1d719ec0633 +size 1300498 diff --git a/taglib.changes b/taglib.changes index e820a81..f0dbd5b 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -Mon Jul 8 09:06:19 UTC 2019 - Tomáš Chvátal - -- 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 - -- 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 - ------------------------------------------------------------------- Sun Jun 2 12:06:18 UTC 2019 - Stefan Brüns diff --git a/taglib.spec b/taglib.spec index df98353..5c801ec 100644 --- a/taglib.spec +++ b/taglib.spec @@ -16,44 +16,33 @@ # -%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 +%define rev ba7adc2bc261ed634c2a964185bcffb9365ad2f4 + +Name: taglib +Version: 1.11.2~git20190601 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: %{sname}-%{version}.tar.xz -Source1: %{sname}.desktop +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 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 @@ -102,88 +91,68 @@ Obsoletes: taglib-devel <= 1.6.3 %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 %{sname}-%{version} -%patch0 +%setup -q -n %{name}-%{rev} +%patch0 -p0 %build -# The testing needs static libs too %cmake \ + -DBUILD_TESTS:BOOL=ON \ -DWITH_ASF:BOOL=ON \ -DWITH_MP4:BOOL=ON \ -%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 + -DBUILD_EXAMPLES:BOOL=ON +make %{?_smp_mflags} all docs %install -%if %{with tests} +%cmake_install + # 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/%{sname}.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%{name}.desktop # Documentation -mkdir -p %{buildroot}%{_defaultdocdir}/libtag-doc -# Copy manually, otherwise fdupes does not work -cp -a build/doc/html/ %{buildroot}%{_defaultdocdir}/libtag-doc/ +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 -%else -%cmake_install -%endif %fdupes %{buildroot} -%check -%if %{with tests} -%ctest -%endif +%post +%desktop_database_post + +%postun +%desktop_database_postun -%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/ -%endif + +%files +%license COPYING.LGPL COPYING.MPL +%{_bindir}/* +%exclude %{_bindir}/taglib-config %changelog