From 8da47e1fa98555bd5322d014efe92d43f1e3e145adb0199a8934dcabdbfbd80e Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Tue, 16 Jun 2015 14:18:14 +0000
Subject: [PATCH] Accepting request 312267 from
 home:pluskalm:branches:multimedia:libs

- Use url for source
- Add baselibs.conf as source
- Cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/312267
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libid3tag?expand=0&rev=11
---
 libid3tag-0.15.1b.tar.bz2 |  3 ---
 libid3tag-0.15.1b.tar.gz  |  3 +++
 libid3tag.changes         |  7 +++++++
 libid3tag.spec            | 44 ++++++++++++++++++++-------------------
 4 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 libid3tag-0.15.1b.tar.bz2
 create mode 100644 libid3tag-0.15.1b.tar.gz

diff --git a/libid3tag-0.15.1b.tar.bz2 b/libid3tag-0.15.1b.tar.bz2
deleted file mode 100644
index 8b8bdd2..0000000
--- a/libid3tag-0.15.1b.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a29c1edd6086f52bba55623075e7b9dacc614a80c864562a9bd36970cde6c76c
-size 228252
diff --git a/libid3tag-0.15.1b.tar.gz b/libid3tag-0.15.1b.tar.gz
new file mode 100644
index 0000000..1df9f03
--- /dev/null
+++ b/libid3tag-0.15.1b.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
+size 338143
diff --git a/libid3tag.changes b/libid3tag.changes
index e7fa418..66bb555 100644
--- a/libid3tag.changes
+++ b/libid3tag.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 16 12:18:10 UTC 2015 - mpluskal@suse.com
+
+- Use url for source
+- Add baselibs.conf as source
+- Cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Fri Nov 23 19:06:26 UTC 2012 - jengelh@inai.de
 
diff --git a/libid3tag.spec b/libid3tag.spec
index 205bcd1..58aabf9 100644
--- a/libid3tag.spec
+++ b/libid3tag.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libid3tag
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -16,48 +16,48 @@
 #
 
 
-Name:           libid3tag
 %define lname	libid3tag0
+Name:           libid3tag
+Version:        0.15.1b
+Release:        0
 Summary:        ID3 Tag Manipulation Library
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
-Version:        0.15.1b
-Release:        0
 Url:            http://www.underbit.com/products/mad/
-
-Source:         %{name}-%{version}.tar.bz2
-Patch:          libid3tag-noweak.dif
+Source0:        ftp://ftp.mars.org/pub/mpeg/%{name}-%{version}.tar.gz
+Source1:        baselibs.conf
+Patch0:         libid3tag-noweak.dif
 Patch1:         libid3tag-gperf.dif
 Patch2:         libid3tag-0.15.1b-mb.diff
 Patch3:         libid3tag-automake-fix.dif
 Patch4:         libid3tag-optflags.patch
 Patch5:         libid3tag-0.15.1b-fix_overflow.patch
 Patch6:         libid3tag-visibility.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gperf
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libid3tag is a library for reading and writing ID3 tags, both ID3v1 and
 the various versions of ID3v2.
 
-%package -n %lname
+%package -n %{lname}
 Summary:        ID3 Tag Manipulation Library
 Group:          System/Libraries
 # O/P added for 12.3
-Obsoletes:      libid3tag < %version-%release
-Provides:       libid3tag = %version-%release
+Obsoletes:      libid3tag < %{version}-%{release}
+Provides:       libid3tag = %{version}-%{release}
 
-%description -n %lname
+%description -n %{lname}
 libid3tag is a library for reading and writing ID3 tags, both ID3v1 and
 the various versions of ID3v2.
 
 %package devel
 Summary:        Development package for libid3tag library
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %version
+Requires:       %{lname} = %{version}
 Requires:       glibc-devel
 
 %description devel
@@ -66,29 +66,31 @@ develop applications with libid3tag.
 
 %prep
 %setup -q
-%patch
+%patch0
 %patch1
 %patch2
 %patch3
 %patch4
 %patch5
 %patch6
+
 %build
 autoreconf -fiv
-%configure --disable-static
+%configure \
+  --disable-static
 make %{?_smp_mflags}
-echo -e "prefix=%_prefix\nexec_prefix=%_prefix\nlibdir=%_libdir\nincludedir=%_includedir\nName: id3tag\nDescription: ID3 tag library\nRequires:\nVersion: %version\nLibs: -L%_libdir -lid3tag\nCflags: -I%_includedir\n" > id3tag.pc
+echo -e "prefix=%{_prefix}\nexec_prefix=%{_prefix}\nlibdir=%{_libdir}\nincludedir=%{_includedir}\nName: id3tag\nDescription: ID3 tag library\nRequires:\nVersion: %{version}\nLibs: -L%{_libdir} -lid3tag\nCflags: -I%{_includedir}\n" > id3tag.pc
 
 %install
-make install DESTDIR="%buildroot"
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 install -m 644 -D id3tag.pc %{buildroot}%{_libdir}/pkgconfig/id3tag.pc
-rm -f $RPM_BUILD_ROOT%{_libdir}/libid3tag*.*a
+rm -f %{buildroot}%{_libdir}/libid3tag*.*a
 
-%post -n %lname -p /sbin/ldconfig
+%post -n %{lname} -p /sbin/ldconfig
 
-%postun -n %lname -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
 
-%files -n %lname
+%files -n %{lname}
 %defattr(-,root,root)
 %{_libdir}/libid3tag.so.0*