Author: arekm Date: Fri Oct 24 20:18:39 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 20081023 (gtk/gui dropped upstream from repo; probably have separate repos now)
---- Files affected: SPECS: libx264.spec (1.22 -> 1.23) ---- Diffs: ================================================================ Index: SPECS/libx264.spec diff -u SPECS/libx264.spec:1.22 SPECS/libx264.spec:1.23 --- SPECS/libx264.spec:1.22 Fri Oct 10 01:52:34 2008 +++ SPECS/libx264.spec Fri Oct 24 22:18:34 2008 @@ -1,7 +1,7 @@ # $Revision$, $Date$ -%define snap 20080816 +%define snap 20081023 %define snaph 2245 -%define rel 4 +%define rel 1 Summary: H264 encoder library Summary(pl.UTF-8): Biblioteka kodująca H264 Name: libx264 @@ -13,12 +13,11 @@ #Source0: http://www.acarlab.com/misc-dnlds/%{name}-%{version}.tar.gz # but it's too old, so use snapshots... Source0: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{snap}-%{snaph}.tar.bz2 -# Source0-md5: 0a188b8e13c62f6a97eba1c5d4ab3a3f +# Source0-md5: 04762a1277681f0bd72b0635fcd24939 Patch0: %{name}-alpha.patch Patch1: %{name}-syms.patch URL: http://www.videolan.org/developers/x264.html BuildRequires: gettext-devel -BuildRequires: gtk+2-devel BuildRequires: pkgconfig %ifarch %{ix86} %{x8664} BuildRequires: yasm >= 0.6.0 @@ -58,56 +57,6 @@ %description static -l pl.UTF-8 Statyczna biblioteka x264. -%package gtk -Summary: x264 GTK+ configuration interface library -Summary(pl.UTF-8): Biblioteka interfejsu konfiguracyjnego GTK+ dla x264 -Group: X11/Libraries -Requires: %{name} = %{version}-%{release} -Conflicts: libx264-gui < 0.1.2-1.20080816_2245.2 - -%description gtk -x264 GTK+ configuration interface library. - -%description gtk -l pl.UTF-8 -Biblioteka interfejsu konfiguracyjnego GTK+ dla x264. - -%package gtk-devel -Summary: Header files for x264gtk library -Summary(pl.UTF-8): Pliki nagłówkowe biblioteki x264gtk -Group: X11/Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-gtk = %{version}-%{release} - -%description gtk-devel -Header files for x264gtk library. - -%description gtk-devel -l pl.UTF-8 -Pliki nagłówkowe biblioteki x264gtk. - -%package gtk-static -Summary: Static x264gtk library -Summary(pl.UTF-8): Statyczna biblioteka x264gtk -Group: X11/Development/Libraries -Requires: %{name}-gtk-devel = %{version}-%{release} - -%description gtk-static -Static x264gtk library. - -%description gtk-static -l pl.UTF-8 -Statyczna biblioteka x264gtk. - -%package gui -Summary: Encoding GUI for x264 -Summary(pl.UTF-8): Graficzny interfejs użytkownika do kodera x264 -Group: X11/Applications/Multimedia -Requires: %{name}-gtk = %{version}-%{release} - -%description gui -Encoding GUI for x264. - -%description gui -l pl.UTF-8 -Graficzny interfejs użytkownika do kodera x264. - %prep %setup -q -n x264-snapshot-%{snap}-%{snaph} %patch0 -p1 @@ -123,7 +72,6 @@ --includedir=%{_includedir} \ --libdir=%{_libdir} \ --extra-cflags="%{rpmcflags}" \ - --enable-gtk \ --enable-pic \ --enable-shared @@ -135,8 +83,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%find_lang x264_gtk - %clean rm -rf $RPM_BUILD_ROOT @@ -147,7 +93,7 @@ %defattr(644,root,root,755) %doc AUTHORS %attr(755,root,root) %{_bindir}/x264 -%attr(755,root,root) %{_libdir}/libx264.so.60 +%attr(755,root,root) %{_libdir}/libx264.so.[0-9][0-9] %files devel %defattr(644,root,root,755) @@ -159,31 +105,15 @@ %defattr(644,root,root,755) %{_libdir}/libx264.a -%files gtk -f x264_gtk.lang -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libx264gtk.so.60 -%{_datadir}/x264 - -%files gtk-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libx264gtk.so -%{_includedir}/x264_gtk*.h -%{_pkgconfigdir}/x264gtk.pc - -%files gtk-static -%defattr(644,root,root,755) -%{_libdir}/libx264gtk.a - -%files gui -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/x264_gtk_encode - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2008/10/24 20:18:34 arekm +- up to 20081023 (gtk/gui dropped upstream from repo; probably have separate repos now) + Revision 1.22 2008/10/09 23:52:34 glen - fix x86_64 build; rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libx264.spec?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
