Author: arekm Date: Tue Dec 11 18:17:45 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - builds
---- Files affected: SPECS: libjpegsimd.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/libjpegsimd.spec diff -u SPECS/libjpegsimd.spec:1.1 SPECS/libjpegsimd.spec:1.2 --- SPECS/libjpegsimd.spec:1.1 Tue Dec 11 13:23:03 2007 +++ SPECS/libjpegsimd.spec Tue Dec 11 19:17:40 2007 @@ -18,11 +18,8 @@ Source0: http://cetus.sakura.ne.jp/softlab/jpeg-x86simd/sources/jpegsrc-6b-x86simd-1.02.tar.bz2 # Source0-md5: 520b8aaaaa8c22eb1f30cade836177ce URL: http://cetus.sakura.ne.jp/softlab/jpeg-x86simd/jpegsimd.html -Patch0: libjpeg-DESTDIR.patch -Patch1: libjpeg-arm.patch -Patch2: libjpeg-include.patch -Patch3: libjpeg-c++.patch -Patch4: libjpeg-libtool.patch +Patch0: %{name}-asm.patch +Patch1: libjpeg-include.patch BuildRequires: libtool BuildRequires: nasm ExclusiveArch: %{ix86} @@ -175,11 +172,8 @@ %prep %setup -q -n jpeg-%{libjpegsimdver}x -#%patch0 -p1 -#%patch1 -p1 -%patch2 -p1 -#%patch3 -p1 -#%patch4 -p1 +%patch0 -p1 +%patch1 -p1 cp -f %{_datadir}/libtool/config.sub . @@ -195,23 +189,8 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir},%{_mandir}/man1} - -%{__make} install install-headers install-lib \ - libdir=%{_libdir} \ - DESTDIR=$RPM_BUILD_ROOT - -install jversion.h $RPM_BUILD_ROOT%{_includedir} - -# remove HAVE_STD{DEF,LIB}_H -# (not necessary but may generate warnings confusing autoconf) -(cd $RPM_BUILD_ROOT%{_includedir} -grep -v 'HAVE_STD..._H' jconfig.h > jconfig.h.new -mv -f jconfig.h.new jconfig.h -) - -bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +%{makeinstall} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -226,7 +205,7 @@ %files devel %defattr(644,root,root,755) -%doc {libjpegsimd,structure}.doc +%doc {libjpeg,structure}.doc %attr(755,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la @@ -236,8 +215,6 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/* %{_mandir}/man1/* -%lang(fi) %{_mandir}/fi/man1/* -%lang(pl) %{_mandir}/pl/man1/* %files static %defattr(644,root,root,755) @@ -249,6 +226,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2007-12-11 18:17:40 arekm +- builds + Revision 1.1 2007-12-11 12:23:03 arekm - saving work ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libjpegsimd.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
