Author: qboosh Date: Wed Dec 26 19:27:47 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - files cleanup part 2; gtkdoc moved to -devel - avoid BRing programs (well, most of; mencoder and mkvtoolnix left for now) - more actual BRs
---- Files affected: SPECS: ogmrip.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/ogmrip.spec diff -u SPECS/ogmrip.spec:1.11 SPECS/ogmrip.spec:1.12 --- SPECS/ogmrip.spec:1.11 Wed Dec 26 19:31:44 2007 +++ SPECS/ogmrip.spec Wed Dec 26 20:27:41 2007 @@ -12,31 +12,35 @@ Group: X11/Applications Source0: http://dl.sourceforge.net/ogmrip/%{name}-%{version}.tar.gz # Source0-md5: 432991f4502ebba8fee51b527ef5b6af -BuildRequires: eject +BuildRequires: GConf2-devel >= 2.6.0 +BuildRequires: dbus-glib-devel >= 0.3.0 BuildRequires: enca-devel -BuildRequires: mencoder +BuildRequires: enchant-devel >= 1.1.0 BuildRequires: gettext-devel -BuildRequires: gocr >= 0.39 -BuildRequires: hal-devel >= 0.4.2 -BuildRequires: intltool -BuildRequires: lame >= 3.96 -BuildRequires: libdvdread-devel >= 0.9 +BuildRequires: glib2-devel >= 1:2.6.0 +BuildRequires: gtk+2-devel >= 2:2.10.0 +BuildRequires: hal-devel >= 0.5.0 +BuildRequires: intltool >= 0.35.0 +BuildRequires: libdvdread-devel >= 0.9.7 +BuildRequires: libglade2-devel >= 1:2.5.0 BuildRequires: libgnomeui-devel >= 2.6.0 +BuildRequires: libnotify-devel >= 0.4.3 BuildRequires: libstdc++-devel +BuildRequires: libtheora-devel >= 1.0-0.alpha5 BuildRequires: libuuid-devel -%{?with_matroska:BuildRequires: mkvtoolnix >= 0.9.5} -BuildRequires: mplayer >= 0.92 -BuildRequires: ogmtools >= 1.0 BuildRequires: pkgconfig -BuildRequires: vorbis-tools >= 1.0 +# TODO: remove configure checks (just assume support for everything, mkvtoolnix 2.x) +BuildRequires: mencoder >= 3:1.0-3.rc1 +%{?with_matroska:BuildRequires: mkvtoolnix >= 2} +Requires(post,preun): GConf2 >= 2.6.0 Requires: eject Requires: gocr >= 0.39 Requires: lame >= 3.96 -%{?with_matroska:Requires: mkvtoolnix >= 0.9.5} -Requires: mplayer >= 0.92 +%{?with_matroska:Requires: mkvtoolnix >= 2} +Requires: mplayer >= 3:1.0-3.rc1 Requires: mencoder Requires: ogmtools >= 1.0 -Requires: vorbis-tools >= 1.0 +Requires: vorbis-tools >= 1:1.0 Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -112,14 +116,27 @@ %build %configure \ + EJECT_PROG=/usr/bin/eject \ + FAAC_PROG=/usr/bin/faac \ + GOCR_PROG=/usr/bin/gocr \ + LAME_PROG=/usr/bin/lame \ + MENCODER_PROG=/usr/bin/mencoder \ + MKVMERGE_PROG=/usr/bin/mkvmerge \ + MPLAYER_PROG=/usr/bin/mplayer \ + OCRAD_PROG=/usr/bin/ocrad \ + OGGENC_PROG=/usr/bin/oggenc \ + OGMMERGE_PROG=/usr/bin/ogmmerge \ + OGMSPLIT_PROG=/usr/bin/ogmsplit \ --disable-schemas-install \ - --with-html-dir=%{_gtkdocdir} + --with-html-dir=%{_gtkdocdir} \ + --with-mplayer-version=1.0rc1 %{__make} %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +# broken install dependecies (/usr/bin/ld: cannot find -logmrip-mplayer) +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/{audio-codecs,containers,subp-codecs,video-codecs}/*.{la,a} @@ -130,7 +147,10 @@ rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install +%gconf_schema_install ogmrip.schemas + +%preun +%gconf_schema_uninstall ogmrip.schemas %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -138,21 +158,33 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog README TODO -%attr(755,root,root) %{_bindir}/* -%{_sysconfdir}/gconf/schemas/* -%{_desktopdir}/*.desktop -%{_pixmapsdir}/* +%attr(755,root,root) %{_bindir}/dvdcpy +%attr(755,root,root) %{_bindir}/ogmrip +%attr(755,root,root) %{_bindir}/srtutil +%attr(755,root,root) %{_bindir}/subp2pgm +%attr(755,root,root) %{_bindir}/theoraenc +%{_sysconfdir}/gconf/schemas/ogmrip.schemas +%{_desktopdir}/ogmrip.desktop +%{_pixmapsdir}/ogmrip.png %{_datadir}/%{name} -%{_mandir}/man1/*.1* -%{_gtkdocdir}/ogmdvd -%{_gtkdocdir}/ogmdvd-gtk -%{_gtkdocdir}/ogmjob -%{_gtkdocdir}/ogmrip -%{_gtkdocdir}/ogmrip-gtk +%{_mandir}/man1/dvdcpy.1* +%{_mandir}/man1/srtutil.1* +%{_mandir}/man1/subp2pgm.1* %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so.*.*.* +%attr(755,root,root) %{_libdir}/libogmdvd.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libogmdvd.so.0 +%attr(755,root,root) %{_libdir}/libogmdvd-gtk.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libogmdvd-gtk.so.0 +%attr(755,root,root) %{_libdir}/libogmjob.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libogmjob.so.0 +%attr(755,root,root) %{_libdir}/libogmrip.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libogmrip.so.0 +%attr(755,root,root) %{_libdir}/libogmrip-gtk.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libogmrip-gtk.so.0 +%attr(755,root,root) %{_libdir}/libogmrip-mplayer.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libogmrip-mplayer.so.0 %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/audio-codecs %attr(755,root,root) %{_libdir}/%{name}/audio-codecs/*.so @@ -165,14 +197,40 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/*.la -%{_includedir}/* -%{_pkgconfigdir}/* +%attr(755,root,root) %{_libdir}/libogmdvd.so +%attr(755,root,root) %{_libdir}/libogmdvd-gtk.so +%attr(755,root,root) %{_libdir}/libogmjob.so +%attr(755,root,root) %{_libdir}/libogmrip.so +%attr(755,root,root) %{_libdir}/libogmrip-gtk.so +%attr(755,root,root) %{_libdir}/libogmrip-mplayer.so +%{_libdir}/libogmdvd.la +%{_libdir}/libogmdvd-gtk.la +%{_libdir}/libogmjob.la +%{_libdir}/libogmrip.la +%{_libdir}/libogmrip-gtk.la +%{_libdir}/libogmrip-mplayer.la +%{_includedir}/ogmdvd +%{_includedir}/ogmjob +%{_includedir}/ogmrip +%{_pkgconfigdir}/ogmdvd.pc +%{_pkgconfigdir}/ogmdvd-gtk.pc +%{_pkgconfigdir}/ogmjob.pc +%{_pkgconfigdir}/ogmrip.pc +%{_pkgconfigdir}/ogmrip-gtk.pc +%{_gtkdocdir}/ogmdvd +%{_gtkdocdir}/ogmdvd-gtk +%{_gtkdocdir}/ogmjob +%{_gtkdocdir}/ogmrip +%{_gtkdocdir}/ogmrip-gtk %files static %defattr(644,root,root,755) -%{_libdir}/*.a +%{_libdir}/libogmdvd.a +%{_libdir}/libogmdvd-gtk.a +%{_libdir}/libogmjob.a +%{_libdir}/libogmrip.a +%{_libdir}/libogmrip-gtk.a +%{_libdir}/libogmrip-mplayer.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -180,6 +238,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2007-12-26 19:27:41 qboosh +- files cleanup part 2; gtkdoc moved to -devel +- avoid BRing programs (well, most of; mencoder and mkvtoolnix left for now) +- more actual BRs + Revision 1.11 2007-12-26 18:31:44 qboosh - files cleanup part 1 - restored ldconfig calls @@ -217,4 +280,3 @@ Revision 1.1 2005/03/08 16:48:07 wolf - new - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ogmrip.spec?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
