1.1 --- a/faad2/faad2.spec Fri Mar 11 21:30:26 2011 +0100 1.2 +++ b/faad2/faad2.spec Fri Mar 11 21:36:51 2011 +0100 1.3 @@ -1,57 +1,59 @@ 1.4 -Summary: Library and frontend for decoding MPEG2/4 AAC 1.5 -Name: faad2 1.6 -Epoch: 1 1.7 -Version: 2.7 1.8 -Release: 1%{?dist} 1.9 -License: GPLv2+ 1.10 -Group: Applications/Multimedia 1.11 -URL: http://www.audiocoding.com/faad2.html 1.12 -Source: http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.bz2 1.13 -# fix non-PIC objects in libmp4ff.a 1.14 -Patch0: %{name}-pic.patch 1.15 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 1.16 -BuildRequires: gcc-c++ 1.17 -BuildRequires: id3lib-devel 1.18 +Name: faad2 1.19 +Summary: Library and frontend for decoding MPEG2/4 AAC 1.20 +Vendor: Europalab Software 1.21 +Packager: Michael Schloh von Bennewitz 1.22 +Distribution: MeeGo Thirdparty 1.23 +Version: 2.7 1.24 +Release: 20101201 1.25 +License: GPLv2+ 1.26 +Group: Applications/Multimedia 1.27 +URL: http://www.audiocoding.com/faad2.html 1.28 +Source: http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.bz2 1.29 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 1.30 +BuildRequires: gcc-c++ 1.31 +BuildRequires: libid3tag-devel 1.32 BuildRequires: libsysfs-devel 1.33 -BuildRequires: zlib-devel 1.34 +BuildRequires: zlib-devel 1.35 1.36 %description 1.37 -FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely 1.38 -written from scratch. 1.39 +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder. 1.40 1.41 %package libs 1.42 -Summary: Shared libraries of the FAAD 2 AAC decoder 1.43 -Group: System Environment/Libraries 1.44 -Obsoletes: %{name} < 1:2.6.1-3 1.45 +Summary: Shared libraries of the FAAD 2 AAC decoder 1.46 +Vendor: Europalab Software 1.47 +Packager: Michael Schloh von Bennewitz 1.48 +Distribution: MeeGo Thirdparty 1.49 +Group: System Environment/Libraries 1.50 1.51 %description libs 1.52 -FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely 1.53 -written from scratch. 1.54 - 1.55 -This package contains libfaad. 1.56 +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder. 1.57 +This package provides the libraries for %{name}. 1.58 1.59 %package devel 1.60 -Summary: Development libraries of the FAAD 2 AAC decoder 1.61 -Group: Development/Libraries 1.62 -Requires: %{name}-libs = %{epoch}:%{version}-%{release} 1.63 +Summary: Development libraries of the FAAD 2 AAC decoder 1.64 +Vendor: Europalab Software 1.65 +Packager: Michael Schloh von Bennewitz 1.66 +Distribution: MeeGo Thirdparty 1.67 +Group: Development/Libraries 1.68 +Requires: %{name}-libs = %{version}-%{release} 1.69 1.70 %description devel 1.71 -FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely 1.72 -written from scratch. 1.73 - 1.74 -This package contains development files and documentation for libfaad. 1.75 +FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder. 1.76 +This package provides development files and documentation for %{name}. 1.77 1.78 %prep 1.79 %setup -q 1.80 -%patch0 -p1 -b .pic 1.81 find . -name "*.c" -o -name "*.h" | xargs chmod 644 1.82 +mv \ 1.83 + docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf \ 1.84 + docs/AACDecoderLibrary.pdf 1.85 1.86 -for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do 1.87 +for f in AUTHORS COPYING ChangeLog NEWS README* TODO; do 1.88 tr -d '\r' <$f >$f.n && touch -r $f $f.n && mv -f $f.n $f 1.89 done 1.90 1.91 %build 1.92 -%configure --disable-static 1.93 +%configure 1.94 1.95 # remove rpath from libtool 1.96 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool 1.97 @@ -62,9 +64,6 @@ 1.98 %install 1.99 %{__rm} -rf %{buildroot} 1.100 %{__make} install DESTDIR=%{buildroot} 1.101 -%{__rm} %{buildroot}%{_libdir}/libfaad.la 1.102 -%{__rm} %{buildroot}%{_includedir}/mp4ff{,int}.h 1.103 -%{__rm} %{buildroot}%{_libdir}/libmp4ff.a 1.104 install -dm755 %{buildroot}%{_mandir}/man1 1.105 %{__mv} %{buildroot}%{_mandir}/{manm/faad.man,man1/faad.1} 1.106 1.107 @@ -87,11 +86,19 @@ 1.108 1.109 %files devel 1.110 %defattr(-, root, root, -) 1.111 -%doc TODO docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf 1.112 +%doc TODO docs/AACDecoderLibrary.pdf 1.113 %{_includedir}/faad.h 1.114 %{_includedir}/neaacdec.h 1.115 +%{_includedir}/mp4ff.h 1.116 +%{_includedir}/mp4ffint.h 1.117 +%{_libdir}/libfaad.a 1.118 +%{_libdir}/libfaad.la 1.119 %{_libdir}/libfaad.so 1.120 +%{_libdir}/libmp4ff.a 1.121 1.122 %changelog 1.123 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 2.7-20101201 1.124 +- Adjust packaging and patch logic 1.125 + 1.126 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> 1:2.7-1 1.127 -- Build for MeeGo 1.1 1.128 +- Package for MeeGo 1.1