- remove HAVE_STD{DEF,LIB}_H defines from jconfig.h

  (they might generate warnings confusing autoconf)
- fixed c++ patch
- release 18

Changed files:
    libjpeg-c++.patch -> 1.2
    libjpeg.spec -> 1.33

diff --git a/libjpeg-c++.patch b/libjpeg-c++.patch
index 81dcc397d1664c64a8b94ed9d1d4c7caf0120441..3e4166ae043b5645a618b9acf989ab237d891556 100644 (file)
--- a/libjpeg-c++.patch
+++ b/libjpeg-c++.patch
@@ -13,8 +13,8 @@
   * installation of the JPEG library is set up.  jconfig.h can be
 @@ -1091,6 +1095,10 @@
  #ifdef JPEG_INTERNALS
- #include "jpegint.h"          /* fetch private declarations */
- #include "jerror.h"           /* fetch error codes too */
+ #include <jpegint.h>          /* fetch private declarations */
+ #include <jerror.h>           /* fetch error codes too */
 +#endif
 +
 +#ifdef __cplusplus

diff --git a/libjpeg.spec b/libjpeg.spec
index fb9dd43fd995ae5665ec7aee5026b4dbc5754425..aee37c56e3f904da1258cceb87cefc59b3637606 100644 (file)
--- a/libjpeg.spec
+++ b/libjpeg.spec
@@ -1,14 +1,15 @@
 Summary:       Library for handling different jpeg files
 Summary(de):   Library zum Verarbeiten verschiedener jpeg-Dateien
 Summary(fr):   Bibliothèque pour gérer différents fichiers jpeg
-Summary(pl):   Biblioteki do manipulacji plikami w ró¿nych formatach jpeg
+Summary(pl):   Biblioteka do manipulacji plikami w formacie jpeg
 Summary(tr):   jpeg resimlerini iþleme kitaplýðý
 Name:          libjpeg
 Version:       6b
-Release:       17
+Release:       18
 License:       distributable
 Group:         Libraries
 Group(de):     Libraries
+Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
 Source0:       ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
@@ -41,7 +42,7 @@ Bu paket, jpeg 
 istemciler içerir.
 
 %package devel
-Summary:       headers for developing programs using libjpeg
+Summary:       Headers for developing programs using libjpeg
 Summary(de):   Header und statische Libraries zum Entwickeln von Programmen mit libjpeg
 Summary(fr):   Bibliothèques statiques et en-têtes pour développer avec libjpeg
 Summary(pl):   Pliki nag³ówkowe libjpeg
@@ -120,7 +121,7 @@ Requires:   %{name}-devel = %{version}
 Static libraries for developing programs using libjpeg.
 
 %description -l pl static
-Statyczna bibliteka libjpeg.
+Statyczna biblioteka libjpeg.
 
 %prep
 %setup  -q -n jpeg-%{version}
@@ -147,6 +148,13 @@ install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir},%{_mandir}/man1}
 
 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
+)
+
 gzip -9nf {libjpeg,structure}.doc
 
 %post   -p /sbin/ldconfig