2014-09-27 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* imlib: remove dependency with libpng12
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8978 ec354946-7b23-47d6-9f5a-488ba84defc7

i/imlib/imlib-vl.spec

@@ -1,34 +1,35 @@
 # Note that this is NOT a relocatable package
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
+Name: imlib
 Summary: Image loading and rendering library for X11R6
 Summary(ja): 画像の読み込み/レンダリング用のライブラリ
-Name: imlib
 Version: 1.9.15
-Release: 3%{?_dist_release}
+Release: 5%{?_dist_release}
+
 License: LGPL
 Group: System Environment/Libraries
+
 Source0: ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0: imlib-1.9.14-suse-alt-bound.patch
+
 Patch1: imlib-1.9.13-sec2.patch
 Patch2: imlib-1.9.14-configure-x86_64.patch
 Patch3: imlib-1.9.15-libpng15.patch
+Patch4: imlib-1.9.15-bpp16-CVE-2007-3568.patch
+Patch5:	imlib-1.9.13-underquoted.patch
+Patch6: imlib-1.9.15-giflib4.patch
 Obsoletes: Imlib
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libpng-devel >= 2:1.2.5
+BuildRequires: giflib-devel
 BuildRequires: gtk+-devel >= 1.2.1
-BuildRequires: libtiff-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libungif-devel
+BuildRequires: libpng-devel >= 2:1.2.5
+BuildRequires: libtiff-devel
 BuildRequires: libSM-devel
 BuildRequires: libXt-devel
-Requires: libpng
+BuildRequires: zlib-devel
-Requires: libtiff
-Requires: libjpeg
-Requires: zlib
 Requires: netpbm-progs
-Requires: libungif
 
 %description
 Imlib is an advanced replacement library for libraries like libXpm that
@@ -61,7 +62,7 @@ Headers, static libraries and documentation for Imlib.
 %package cfgeditor
 Summary: Imlib configuration editor
 Summary(ja): Imlib 設定エディタ
-Group: User Interface/Desktops
+Group: Applicatins/System
 Requires: %{name} = %{version}
 #Requires: gtk+ >= 1.2.1
 
@@ -75,10 +76,23 @@ color and handles gamma correction/etc.
 %patch1 -p1 -b .can-2004-1025_1026
 %patch2 -p1 -b .x86_64
 %patch3 -p0 -b .libpng
+## CVE-2007-3568 (DoS via a BMP image with a Bits Per Page of 0) (#426091)
+%patch4 -p0 -b .bpp16
+## Fix underquoted m4 definitions
+%patch5 -p1 -b .underquoted
+%patch6 -p1 -b .giflib4
 
 %build
 %define __libtoolize /bin/true
 %configure --disable-static
+
+## Remove -L%%{_libdir} from imlib-config if present;
+## it's redundant and breaks multilib compatibility
+sed -i -e 's,-L%{_libdir} ,,g' imlib-config
+
+## Kill bogus RPATHs
+sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 if [ "$SMP" != "" ]; then
   (make "MAKE=make -k -j $SMP"; exit 0)
   make
@@ -138,6 +152,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %endif
 
 %changelog
+* Fri Sep 26 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.9.15-5
+- added Patch4, Patch5 from Fedora
+- added Patch6 to build with giflib-4.2.3
+
 * Fri Jul 18 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9.15-4
 - add BuildRequires: libSM-devel, libXt-devel
 - add Patch3 (imlib-1.9.15-libpng15.patch) from fedora