Author: arekm Date: Fri Jul 10 12:08:48 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to version 7
---- Files affected: packages/libjpeg: libjpeg.spec (1.66 -> 1.67) , libjpeg-DESTDIR.patch (1.1 -> NONE) (REMOVED), libjpeg-arith.patch (1.1 -> NONE) (REMOVED), libjpeg-arm.patch (1.1 -> NONE) (REMOVED), libjpeg-c++.patch (1.2 -> NONE) (REMOVED), libjpeg-crop.patch (1.1 -> NONE) (REMOVED), libjpeg-include.patch (1.1 -> NONE) (REMOVED), libjpeg-libtool.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/libjpeg/libjpeg.spec diff -u packages/libjpeg/libjpeg.spec:1.66 packages/libjpeg/libjpeg.spec:1.67 --- packages/libjpeg/libjpeg.spec:1.66 Sun Jun 29 16:26:59 2008 +++ packages/libjpeg/libjpeg.spec Fri Jul 10 14:08:42 2009 @@ -1,9 +1,4 @@ # $Revision$, $Date$ -# -# Conditional build: -%bcond_with arith # arithmetic coding support (changes error codes in ABI, patent problems somewhere) -%bcond_with crop # lossless cropping support (changes error codes in ABI) -# Summary: Library for handling different JPEG files Summary(de.UTF-8): Library zum Verarbeiten verschiedener JPEG-Dateien Summary(es.UTF-8): Biblioteca para manipulación de diferentes archivos JPEGs @@ -14,23 +9,14 @@ Summary(tr.UTF-8): JPEG resimlerini işleme kitaplığı Summary(uk.UTF-8): Бібліотека для обробки різноманітних JPEG-файлів Name: libjpeg -Version: 6b -Release: 28 +Version: 7 +Release: 1 License: distributable Group: Libraries -Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz -# Source0-md5: dbd5f3b47ed13132f04c685d608a7547 +Source0: http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz +# Source0-md5: 382ef33b339c299b56baf1296cda9785 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: d6342c015a489de275ada637a77dc2b0 -Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-arm.patch -Patch2: %{name}-include.patch -Patch3: %{name}-c++.patch -Patch4: %{name}-libtool.patch -# from http://sylvana.net/jpeg-ari/jpeg-ari-28mar98.tar.gz -Patch5: %{name}-arith.patch -# from http://sylvana.net/jpegcrop/croppatch.tar.gz -Patch6: %{name}-crop.patch URL: http://www.ijg.org/ BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -177,21 +163,13 @@ %prep %setup -q -n jpeg-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%{?with_arith:%patch5 -p1} -%{?with_crop:%patch6 -p1} %build %configure \ --enable-shared \ --enable-static -%{__make} \ - libdir=%{_libdir} +%{__make} LD_PRELOAD=$PWD/.libs/%{name}.so \ %{__make} test @@ -200,18 +178,14 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir},%{_mandir}/man1} -%{__make} install install-headers install-lib \ - libdir=%{_libdir} \ +%{__make} install \ 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 -) +sed -i -e 's#.*HAVE_STD..._H.*##g' $RPM_BUILD_ROOT%{_includedir}/jconfig.h bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} @@ -223,13 +197,13 @@ %files %defattr(644,root,root,755) -%doc README change.log %{?with_arith:README.arithmetic} +%doc README change.log %attr(755,root,root) %{_libdir}/libjpeg.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libjpeg.so.62 +%attr(755,root,root) %ghost %{_libdir}/libjpeg.so.7 %files devel %defattr(644,root,root,755) -%doc {libjpeg,structure}.doc +%doc libjpeg.txt structure.txt %attr(755,root,root) %{_libdir}/libjpeg.so %{_libdir}/libjpeg.la %{_includedir}/jconfig.h @@ -264,6 +238,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.67 2009/07/10 12:08:42 arekm +- up to version 7 + Revision 1.66 2008/06/29 14:26:59 areq - don't cp -f %{_datadir}/libtool/config.sub . ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjpeg/libjpeg.spec?r1=1.66&r2=1.67&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
