- updated to 1.7

- removed obsolete libtool and am patches

Changed files:
    kde-ac260-lt.patch -> 1.2
    taglib-am.patch -> 1.2
    taglib-libtool-sanitize.patch -> 1.2
    taglib.spec -> 1.42

diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644 (file)
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in     2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
-   # The `*' in the case matches for architectures that use `case' in
-   # $output_verbose_cmd can trigger glob expansion during the loop
-   # eval without this substitution.
--  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
- 
-   for p in `eval $output_verbose_link_cmd`; do
-     case $p in

diff --git a/taglib-am.patch b/taglib-am.patch
deleted file mode 100644 (file)
index 5580870..0000000
--- a/taglib-am.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur taglib-1.6/admin/cvs.sh taglib-1.6.new/admin/cvs.sh
---- taglib-1.6/admin/cvs.sh    2008-08-19 21:56:25.000000000 +0200
-+++ taglib-1.6.new/admin/cvs.sh        2009-09-24 11:10:53.064811129 +0200
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;
-Tylko w taglib-1.6.new/admin: cvs.sh~

diff --git a/taglib-libtool-sanitize.patch b/taglib-libtool-sanitize.patch
deleted file mode 100644 (file)
index 18fd770..0000000
--- a/taglib-libtool-sanitize.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdemultimedia-3.1.3/admin/libtool.m4.in.orig       Tue Jul 15 12:03:59 2003
-+++ kdemultimedia-3.1.3/admin/libtool.m4.in    Fri Sep  5 14:54:56 2003
-@@ -11412,6 +11412,19 @@
-        if test "$pre_test_object_deps_done" = no; then
-        case $p in
-        -L* | -R*)
-+         # sanitize
-+         new_c=$(echo $p | sed -e ['s/\(-[LR]\).*/\1/'])
-+         new_d=["${p#-[LR]}"]
-+         if ! test -d $new_d -a -x $new_d ; then
-+           continue
-+         fi
-+         # normalize
-+         new_d=$(cd $new_d ; pwd)
-+         # uniq
-+         if echo "${compiler_lib_search_path_CXX}" | grep -q -F -e "\(^\| \)$new_c$new_d\( \|$\)"; then
-+           continue
-+         fi
-+         p="$new_c$new_d"
-          # Internal compiler library paths should come after those
-          # provided the user.  The postdeps already come after the
-          # user supplied libs so there is no need to process them.

diff --git a/taglib.spec b/taglib.spec
index 344997b1ae350499f5b94cfff91cbba92b6cea8c..7ce47be34420ec672ec75be011635a43ac85afb9 100644 (file)
--- a/taglib.spec
+++ b/taglib.spec
@@ -1,23 +1,18 @@
-# TODO:
-# - dangling patches
-# - optflags (CMAKE_BUILD_TYPE=Release overrides them)

 Summary:       A tag library for reading and editing audio meta data
 Summary(pl.UTF-8):     Biblioteka tag do odczytu i edycji metadanych dotyczących dźwięku
 Name:          taglib
 Summary:       A tag library for reading and editing audio meta data
 Summary(pl.UTF-8):     Biblioteka tag do odczytu i edycji metadanych dotyczących dźwięku
 Name:          taglib

-Version:       1.6.3
-Release:       2
+Version:       1.7
+Release:       1

 License:       LGPL v2.1 or MPL v1.1
 Group:         Libraries
 Source0:       http://ktown.kde.org/~wheeler/files/src/%{name}-%{version}.tar.gz
 License:       LGPL v2.1 or MPL v1.1
 Group:         Libraries
 Source0:       http://ktown.kde.org/~wheeler/files/src/%{name}-%{version}.tar.gz

-# Source0-md5: ddf02f4e1d2dc30f76734df806e613eb
-Patch0:                %{name}-libtool-sanitize.patch
-Patch1:                kde-ac260-lt.patch
-Patch2:                %{name}-am.patch
+# Source0-md5: 6a7e312668f153fa905a81714aebc257

 URL:           http://ktown.kde.org/~wheeler/taglib.html
 BuildRequires: cmake >= 2.6.2
 BuildRequires: libstdc++-devel
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 URL:           http://ktown.kde.org/~wheeler/taglib.html
 BuildRequires: cmake >= 2.6.2
 BuildRequires: libstdc++-devel
 BuildRequires: perl-base
 BuildRequires: pkgconfig

+BuildRequires: rpmbuild(macros) >= 1.577

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -63,14 +58,7 @@ Przykładowe programy w postaci źródłowej dla tagliba.
 install -d build
 cd build
 %cmake .. \
 install -d build
 cd build
 %cmake .. \

-       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DLIB_INSTALL_DIR=%{_libdir} \
-%if "%{_lib}" == "lib64"
-       -DLIB_SUFFIX=64 \
-%endif
-       -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \

        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \

-       -DCMAKE_VERBOSE_MAKEFILE=ON \

        -DWITH_ASF=ON \
        -DWITH_MP4=ON
 
        -DWITH_ASF=ON \
        -DWITH_MP4=ON