- up to final 1.3 - C bindings are back

- use automake for now (unsermake is broken, tested both 040805 and 040908)

Changed files:
    taglib.spec -> 1.15

diff --git a/taglib.spec b/taglib.spec
index 8e11ea70738074b949ed64ea74e0fc3c9a5aab04..edcd0ddb1259f71b0342863949fec638017cc28c 100644 (file)
--- a/taglib.spec
+++ b/taglib.spec
@@ -3,16 +3,16 @@ Summary:      A tag library for reading and editing audio meta data
 Summary(pl):   Biblioteka tag do odczytu i edycji metadanych dotycz±cych d¼wiêku
 Name:          taglib
 Version:       1.3
-Release:       0.%{_snap}.1
+Release:       1
 License:       GPL
 Group:         X11/Libraries
-Source0:       %{name}-%{_snap}.tar.bz2
-# Source0-md5: 52afc2b5a223980b6128b6908a86e01b
+Source0:       http://ktown.kde.org/~wheeler/files/src/%{name}-%{version}.tar.gz
+# Source0-md5: 54fe2a3abf0cf77130207846b0ce6ef4
 Patch0:                %{name}-libtool-sanitize.patch
-URL:           http://ktown.kde.org/~wheeler/taglib/
+URL:           http://ktown.kde.org/~wheeler/taglib.html
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1.6
-BuildRequires: unsermake >= 040805-1
+#BuildRequires:        unsermake >= 040805-1
 BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,12 +38,14 @@ Header files for tag library.
 Pliki nag³ówkowe biblioteki tag.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.* admin
-export UNSERMAKE=/usr/share/unsermake/unsermake
+# unsermake is broken here (Makefile.calls not generated by configure)
+#export UNSERMAKE=/usr/share/unsermake/unsermake
+%{__perl} -pi -e 's/(automake\*1\.6\.\* \| automake\*1\.7\*)/automake*1.[6-9]*/' admin/cvs.sh
 %{__make} -f admin/Makefile.common cvs
 
 %configure \
@@ -68,11 +70,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libtag.so.*.*.*
-
+%attr(755,root,root) %{_libdir}/libtag_c.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/taglib-config
-%{_includedir}/taglib
+%attr(755,root,root) %{_libdir}/libtag.so
+%attr(755,root,root) %{_libdir}/libtag_c.so
 %{_libdir}/libtag.la
-%{_libdir}/libtag.so
+%{_libdir}/libtag_c.la
+%{_includedir}/taglib