rpms/x264/devel x264.spec,1.3,1.4

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21994

Modified Files:
	x264.spec 
Log Message:
* Mon Nov 17 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.18.20080905
- partially revert latest changes (the separate sse2 libs part) until selinux
  policy catches up



Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264.spec	7 Nov 2008 20:49:39 -0000	1.3
+++ x264.spec	17 Nov 2008 20:20:29 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.0.0
-Release: 0.17.%{snapshot}%{?dist}
+Release: 0.18.%{snapshot}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
@@ -103,29 +103,13 @@
 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 mv -f AUTHORS.utf8 AUTHORS
 convert gtk/x264.ico x264icon.png
-%ifarch %{ix86}
-mkdir sse2
-cp -a `ls -1|grep -v sse2` sse2/
-%endif
 
 %build
 %{x_configure}\
 	--libdir=%{_libdir} \
 	--enable-gtk \
-%ifarch %{ix86}
-	--disable-asm
-%endif
-
-%{__make} %{?_smp_mflags}
-%ifarch %{ix86}
-pushd sse2
-%{x_configure}\
-	--libdir=%{_libdir}/sse2 \
-	--disable-gtk
 
 %{__make} %{?_smp_mflags}
-popd
-%endif
 
 %install
 %{__rm} -rf %{buildroot}
@@ -139,13 +123,6 @@
 %{__install} -Dpm 644 x264icon.png \
 	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
-%ifarch %{ix86}
-pushd sse2
-%{__make} DESTDIR=%{buildroot} install
-popd
-rm %{buildroot}%{_libdir}/sse2/pkgconfig/x264.pc
-%endif
-
 %find_lang %{name}_gtk
 
 %clean
@@ -177,9 +154,6 @@
 %files libs
 %defattr(644, root, root, 0755)
 %{_libdir}/libx264.so.*
-%ifarch %{ix86}
-%{_libdir}/sse2/libx264.so.*
-%endif
 
 %files devel
 %defattr(644, root, root, 0755)
@@ -187,9 +161,6 @@
 %{_includedir}/x264.h
 %{_libdir}/libx264.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifarch %{ix86}
-%{_libdir}/sse2/libx264.so
-%endif
 
 %files gui -f %{name}_gtk.lang
 %defattr(644, root, root, 0755)
@@ -206,6 +177,10 @@
 %{_libdir}/pkgconfig/%{name}gtk.pc
 
 %changelog
+* Mon Nov 17 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.18.20080905
+- partially revert latest changes (the separate sse2 libs part) until selinux
+  policy catches up
+
 * Fri Nov 07 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.17.20080905
 - build libs without asm optimizations for less capable x86 CPUs (livna bug #2066)
 - fix missing 0 in Obsoletes version (never caused any problems)