1.1 --- a/libmad/libmad.spec Fri Mar 11 21:30:26 2011 +0100
1.2 +++ b/libmad/libmad.spec Fri Mar 11 21:36:51 2011 +0100
1.3 @@ -1,43 +1,41 @@
1.4 -Name: libmad
1.5 -Version: 0.15.1b
1.6 -Release: 14%{?dist}
1.7 -Summary: MPEG audio decoder library
1.8 -
1.9 -Group: System Environment/Libraries
1.10 -License: GPLv2
1.11 -URL: http://www.underbit.com/products/mad/
1.12 -Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
1.13 -Patch0: libmad-0.15.1b-multiarch.patch
1.14 -Patch1: libmad-0.15.1b-ppc.patch
1.15 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.16 -
1.17 -BuildRequires: automake
1.18 -BuildRequires: autoconf
1.19 -BuildRequires: libtool
1.20 -
1.21 +Name: libmad
1.22 +Summary: MPEG audio decoder library
1.23 +Vendor: Europalab Software
1.24 +Packager: Michael Schloh von Bennewitz
1.25 +Distribution: MeeGo Thirdparty
1.26 +Version: 0.15.1b
1.27 +Release: 20101201
1.28 +Group: System Environment/Libraries
1.29 +License: GPLv2
1.30 +URL: http://www.underbit.com/products/mad/
1.31 +Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
1.32 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.33
1.34 %description
1.35 -MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
1.36 +MAD is a high quality MPEG audio decoder. It currently supports MPEG-1
1.37 and the MPEG-2 extension to Lower Sampling Frequencies, as well as the
1.38 so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
1.39 and Layer III a.k.a. MP3) are fully implemented.
1.40
1.41 -%package devel
1.42 -Summary: MPEG audio decoder library development files
1.43 -Group: Development/Libraries
1.44 -Requires: %{name} = %{version}-%{release}
1.45 -Requires: pkgconfig
1.46 +%package devel
1.47 +Summary: MPEG audio decoder library development files
1.48 +Vendor: Europalab Software
1.49 +Packager: Michael Schloh von Bennewitz
1.50 +Distribution: MeeGo Thirdparty
1.51 +Group: Development/Libraries
1.52 +Requires: %{name} = %{version}-%{release}
1.53 +Requires: pkgconfig
1.54
1.55 -%description devel
1.56 -%{summary}.
1.57 -
1.58 +%description devel
1.59 +MAD is a high quality MPEG audio decoder. It currently supports MPEG-1
1.60 +and the MPEG-2 extension to Lower Sampling Frequencies, as well as the
1.61 +so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
1.62 +and Layer III a.k.a. MP3) are fully implemented. This package contains
1.63 +the header and library files needed to develop with %{name}.
1.64
1.65 %prep
1.66 %setup -q
1.67 -%patch0 -p1 -b .multiarch
1.68 -%patch1 -p1 -b .ppc
1.69 -
1.70 -sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
1.71 +sed -i -e /-fforce-mem/d configure*
1.72 touch -r aclocal.m4 configure.ac NEWS AUTHORS ChangeLog
1.73
1.74 # Create an additional pkgconfig file
1.75 @@ -55,37 +53,27 @@
1.76 Cflags: -I%{_includedir}
1.77 EOF
1.78
1.79 -
1.80 -
1.81 %build
1.82 -autoreconf -sfi
1.83 %configure \
1.84 %ifarch x86_64 ia64 ppc64
1.85 - --enable-fpm=64bit \
1.86 + --enable-fpm=64bit \
1.87 %endif
1.88 - --disable-dependency-tracking \
1.89 - --enable-accuracy \
1.90 - --disable-debugging \
1.91 - --disable-static
1.92 -
1.93 -make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS"
1.94 + --enable-accuracy \
1.95 + --disable-debugging
1.96 +make %{?_smp_mflags}
1.97
1.98 %install
1.99 rm -rf $RPM_BUILD_ROOT
1.100 make install DESTDIR=$RPM_BUILD_ROOT
1.101 -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
1.102 %{__install} -D -p -m 0644 mad.pc %{buildroot}%{_libdir}/pkgconfig/mad.pc
1.103 -touch -r mad.h.sed %{buildroot}/%{_includedir}/mad.h
1.104
1.105 %clean
1.106 rm -rf $RPM_BUILD_ROOT
1.107
1.108 -
1.109 %post -p /sbin/ldconfig
1.110
1.111 %postun -p /sbin/ldconfig
1.112
1.113 -
1.114 %files
1.115 %defattr(-,root,root,-)
1.116 %doc CHANGES COPYING COPYRIGHT CREDITS README TODO
1.117 @@ -93,12 +81,16 @@
1.118
1.119 %files devel
1.120 %defattr(-,root,root,-)
1.121 +%{_libdir}/libmad.a
1.122 +%{_libdir}/libmad.la
1.123 %{_libdir}/libmad.so
1.124 %{_libdir}/pkgconfig/mad.pc
1.125 %{_includedir}/mad.h
1.126
1.127 +%changelog
1.128 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 0.15.1b-20101201
1.129 +- Adjust packaging and patch logic
1.130
1.131 -%changelog
1.132 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 0.15.1b-14
1.133 - Build for MeeGo 1.1
1.134
