Packman Build Service PMBS

Changes of Revision 5

faad2.changes Changed

faad2.spec Changed

@@ -13,7 +13,8 @@
 %else
 %bcond_without xmms
 %endif
-%bcond_without mpeg4ip
+# mpeg4ip is built without gmp4player, it makes no sense to build the plugin
+%bcond_with mpeg4ip
 
 Name:           faad2
 Version:        2.7
@@ -72,9 +73,6 @@
 Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}-%{release}
-%if %{with mpeg4ip}
-Requires:       libmp4v2-devel
-%endif
 Obsoletes:      libfaad2-devel < %{version}-%{release}
 Provides:       libfaad2-devel = %{version}-%{release}
 Obsoletes:      faad2-devel < %{version}-%{release}
@@ -130,12 +128,8 @@
 %{__make} %{?jobs:-j%{jobs}}
 
 %install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-mkdir %{buildroot}
 %makeinstall
-rm -f %{buildroot}/%{_libdir}/*.a
-%{__install} -m 644 common/mp4ff/mp4ff.h %{buildroot}%{_includedir}/
-%{__install} -m 644 common/mp4ff/mp4ff_int_types.h %{buildroot}%{_includedir}/
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
@@ -155,8 +149,10 @@
 
 %files -n %{lib}-devel
 %defattr(-, root, root)
-%{_libdir}/*.*a
 %{_libdir}/*.so
+# Let it be static since I don't want to start worring about versioning. I'm not
+# even sure if it's supposed to be public...
+%{_libdir}/libmp4ff.a
 %{_includedir}/*
 
 %if %{with xmms}