diff --git a/taglib-1.10.tar.gz b/taglib-1.10.tar.gz new file mode 100644 index 0000000..f955ced --- /dev/null +++ b/taglib-1.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa +size 1233893 diff --git a/taglib-1.7.2-doxygen.patch b/taglib-1.7.2-doxygen.patch deleted file mode 100644 index 4011235..0000000 --- a/taglib-1.7.2-doxygen.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20a1141..0e9e884 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,7 @@ if(BUILD_TESTS) - endif(BUILD_TESTS) - add_subdirectory(examples) - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile) - file(COPY doc/taglib.png DESTINATION doc) - add_custom_target(docs doxygen) - diff --git a/taglib-1.8-strip-rpath.patch b/taglib-1.8-strip-rpath.patch deleted file mode 100644 index 6efbf4f..0000000 --- a/taglib-1.8-strip-rpath.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: examples/CMakeLists.txt -=================================================================== ---- examples/CMakeLists.txt.orig 2012-09-06 20:03:15.000000000 +0200 -+++ examples/CMakeLists.txt 2013-04-23 08:44:33.938480393 +0200 -@@ -11,6 +11,8 @@ if(ENABLE_STATIC) - add_definitions(-DTAGLIB_STATIC) - endif(ENABLE_STATIC) - -+SET(CMAKE_SKIP_BUILD_RPATH TRUE) -+ - ########### next target ############### - - ADD_EXECUTABLE(tagreader tagreader.cpp) -@@ -45,6 +47,14 @@ ADD_EXECUTABLE(strip-id3v1 strip-id3v1.c - - TARGET_LINK_LIBRARIES(strip-id3v1 tag ) - -+#set_target_properties(examples PROPERTIES -+# INSTALL_NAME_DIR ${BIN_INSTALL_DIR} -+# LINK_INTERFACE_LIBRARIES "" -+#) -+ -+#install(TARGETS examples -+# FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} -+# RUNTIME DESTINATION ${BIN_INSTALL_DIR} -+#) - - endif(BUILD_EXAMPLES) -- diff --git a/taglib-1.9.1.tar.gz b/taglib-1.9.1.tar.gz deleted file mode 100644 index 1331464..0000000 --- a/taglib-1.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a -size 654074 diff --git a/taglib-1.9.1.uint.patch b/taglib-1.9.1.uint.patch deleted file mode 100644 index 34eee56..0000000 --- a/taglib-1.9.1.uint.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- - tests/test_info.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: taglib-1.9.1/tests/test_info.cpp -=================================================================== ---- taglib-1.9.1.orig/tests/test_info.cpp -+++ taglib-1.9.1/tests/test_info.cpp -@@ -34,14 +34,14 @@ public: - { - RIFF::Info::Tag tag; - -- CPPUNIT_ASSERT_EQUAL((uint)0, tag.track()); -+ CPPUNIT_ASSERT_EQUAL((TagLib::uint)0, tag.track()); - tag.setTrack(1234); -- CPPUNIT_ASSERT_EQUAL((uint)1234, tag.track()); -+ CPPUNIT_ASSERT_EQUAL((TagLib::uint)1234, tag.track()); - CPPUNIT_ASSERT_EQUAL(String("1234"), tag.fieldText("IPRT")); - -- CPPUNIT_ASSERT_EQUAL((uint)0, tag.year()); -+ CPPUNIT_ASSERT_EQUAL((TagLib::uint)0, tag.year()); - tag.setYear(1234); -- CPPUNIT_ASSERT_EQUAL((uint)1234, tag.year()); -+ CPPUNIT_ASSERT_EQUAL((TagLib::uint)1234, tag.year()); - CPPUNIT_ASSERT_EQUAL(String("1234"), tag.fieldText("ICRD")); - } - }; diff --git a/taglib.changes b/taglib.changes index fa15ab6..d1e1d9f 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Mon Jan 4 08:49:06 UTC 2016 - olaf@aepfle.de + +- Fix build in SLE_11 by disabling post-install + +------------------------------------------------------------------- +Sat Jan 2 17:06:39 UTC 2016 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Use cmake macros +- Update to 1.10 + * New API for the audio length in milliseconds. + * Added new options to the tagwriter example. + * Added support for ID3v2 ETCO and SYLT frames. + * Added support for album artist in PropertyMap API of MP4 files. + * Added support for embedded frames in ID3v2 CHAP and CTOC + frames. + * Added support for AIFF-C files. + * Better handling of duplicate ID3v2 tags in MPEG files. + * Allowed generating taglib.pc on Windows. + * Added ZLIB_SOURCE build option. + * Fixed backwards-incompatible change in TagLib::String when + constructing UTF16 strings. + * Fixed crash when parsing certain FLAC files. + * Fixed crash when encoding empty strings. + * Fixed saving of certain XM files on OS X. + * Changed Xiph and APE generic getters to return + space-concatenated values. + * Fixed possible file corruptions when removing tags from WAV + files. + * Added support for MP4 files with 64-bit atoms in certain 64-bit + environments. + * Prevented ID3v2 padding from being too large. + * Fixed crash when parsing corrupted APE files. + * Fixed crash when parsing corrupted WAV files. + * Fixed crash when parsing corrupted Ogg FLAC files. + * Fixed crash when parsing corrupted MPEG files. + * Fixed saving empty tags in WAV files. + * Fixed crash when parsing corrupted Musepack files. + * Fixed possible memory leaks when parsing AIFF and WAV files. + * Fixed crash when parsing corrupted MP4 files. + * Stopped writing empty ID3v2 frames. + * Fixed possible file corruptions when saving WMA files. + * Added TagLib::MP4::Tag::isEmpty(). + * Added accessors to manipulate MP4 tags. + * Fixed crash when parsing corrupted WavPack files. + * Fixed seeking MPEG frames. + * Fixed reading FLAC files with zero-sized padding blocks. + * Added support for reading the encoder information of WMA files. + * Added support for reading the codec of WAV files. + * Added support for multi channel WavPack files. + * Added support for reading the nominal bitrate of Ogg Speex + files. + * Added support for VBR headers in MPEG files. + * Marked FLAC::File::streamInfoData() deprecated. It returns an + empty ByteVector. + * Marked FLAC::File::streamLength() deprecated. It returns zero. + * Fixed possible file corruptions when adding an ID3v1 tag to + FLAC files. + * Fixed self-assignment operator in some types. + * Fixed extraction of MP4 tag keys with an empty list. + * Many smaller bug fixes and performance improvements. +- Drop no longer needed patches: + * taglib-1.7.2-doxygen.patch + * taglib-1.8-strip-rpath.patch + * taglib-1.9.1.uint.patch + ------------------------------------------------------------------- Fri May 16 10:40:52 CEST 2014 - ohering@suse.de diff --git a/taglib.spec b/taglib.spec index 7b521b5..182f966 100644 --- a/taglib.spec +++ b/taglib.spec @@ -1,7 +1,7 @@ # # spec file for package taglib # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: taglib -Version: 1.9.1 +Version: 1.10 Release: 0 Summary: Audio Meta-Data Library License: LGPL-2.1+ and MPL-1.1 @@ -26,28 +26,23 @@ Url: http://taglib.github.io/ Source0: http://taglib.github.io/releases/taglib-%{version}.tar.gz Source1: %{name}.desktop Source100: baselibs.conf -Patch1: taglib-1.7.2-doxygen.patch -# Get example executables to build without rpath -Patch3: taglib-1.8-strip-rpath.patch -# Fix build error with 11.4 -Patch4: taglib-1.9.1.uint.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz-gnome BuildRequires: libcppunit-devel -BuildRequires: pkg-config -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif BuildRequires: librcc-devel +BuildRequires: pkg-config BuildRequires: zlib-devel # 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} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif %description TagLib is a library for reading and editing the meta-data of several popular @@ -102,32 +97,17 @@ This package contains development files for taglib. %prep %setup -q -%patch1 -p1 -%patch3 -%patch4 -p1 %build -mkdir build -cd build -export CXXFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)" -export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)" -_libsuffix=$(echo %{_lib} | cut -b4-) -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DBUILD_TESTS:BOOL=ON \ - -DLIB_SUFFIX=$_libsuffix \ - -DWITH_ASF:BOOL=ON \ - -DWITH_MP4:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON .. -make %{?_smp_mflags} VERBOSE=1 -cd .. - -doxygen -u -doxygen +%cmake \ + -DBUILD_TESTS:BOOL=ON \ + -DWITH_ASF:BOOL=ON \ + -DWITH_MP4:BOOL=ON \ + -DBUILD_EXAMPLES:BOOL=ON +make %{?_smp_mflags} all docs %install -pushd build -make DESTDIR=%{buildroot} install -popd +%cmake_install # install susehelp file mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ @@ -140,7 +120,7 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Li # Documentation mkdir -p %{buildroot}%{_defaultdocdir}/libtag-devel rm -f examples/CMake* -cp -a AUTHORS COPYING.LGPL COPYING.MPL NEWS doc/html/ examples/ %{buildroot}%{_defaultdocdir}/libtag-devel/ +cp -a AUTHORS COPYING.LGPL COPYING.MPL NEWS build/doc/html/ examples/ %{buildroot}%{_defaultdocdir}/libtag-devel/ %fdupes -s %{buildroot} # Add built examples to taglib package. @@ -153,8 +133,13 @@ for i in `find build/examples -maxdepth 1 ! -type d -executable`; do cp -v ${i} #make check #popd -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%if 0%{?suse_version} > 1110 +%post +%desktop_database_post + +%postun +%desktop_database_postun +%endif %post -n libtag1 -p /sbin/ldconfig