updated: imlib2

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

i/imlib2/imlib2-vl.spec

@@ -1,15 +1,30 @@
 Summary: Powerful image loading and rendering library
 Summary(ja): 強力な画像ロード & レンダリングライブラリ
 Name: imlib2
-Version: 1.4.1
+Version: 1.4.3
 Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.enlightenment.org/Libraries/Imlib2
 Source: http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
+Patch1:         imlib2-1.4.3-cve-2010-0991.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: %{name}-loader = %{version}
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: freetype2-devel
+BuildRequires: libid3tag-devel
+%if %{?_dist_release} == "vl4"
+BuildRequires: XOrg-devel
+BuildRequires: autoconf libtool
+%else
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+%endif
+Requires: %{name}-loaders = %{version}
 
 %description
 Imlib2 is an advanced replacement library for libraries like libXpm that
@@ -22,6 +37,7 @@ Summary: Imlib2 headers, static libraries and documentation
 Summary(ja): Imlib2 のヘッダーファイル，静的ライブラリ，ドキュメント
 Group: Development/Libraries
 Requires: %{name} = %{version}
+
 %description devel
 Headers, static libraries and documentation for Imlib2.
 
@@ -29,22 +45,23 @@ Headers, static libraries and documentation for Imlib2.
 Summary: Imlib2 basic plugin filters set
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
+
 %description filters
 Basic set of plugin filters that come with Imlib2
 
-%package loader
+%package loaders
 Summary: Imlib2 loader set
 Group: System Environment/Libraries
-Requires: libjpeg libpng zlib libtiff
-BuildRequires: libjpeg-devel libpng-devel zlib-devel libtiff-devel
-BuildRequires: libid3tag-devel
+#Requires: libjpeg libpng zlib libtiff
 Provides: %{name}-loader_jpeg %{name}-loader_png %{name}-loader_argb
 Provides: %{name}-loader_bmp %{name}-loader_gif %{name}-loader_pnm
 Provides: %{name}-loader_tga %{name}-loader_tiff %{name}-loader_xpm
 Provides: %{name}-loader_gz %{name}-loader_bz2 
 Provides: %{name}-loader_lbm %{name}-loader_id3
+Provides: %{name}-loader = %{version}-%{release}
+Obsoletes: %{name}-loader < %{version}-%{release}
 
-%description loader
+%description loaders
 Set of image loader/saver of Imlib2. This package contains 
 the following loader.
 
@@ -65,8 +82,15 @@ loader_id3 - id3 tag image loader/saver
 %prep
 %setup -q
 
+%patch1 -p1
+
+%if %{?_dist_release} == "vl4"
+libtoolize --force --copy
+autoreconf -f
+%endif
+
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -74,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # remove unpackage files
-rm -f $RPM_BUILD_ROOT%{_libdir}/imlib2/*/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/imlib2/*/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -86,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,0755)
-%doc AUTHORS README COPYING ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif
+%doc AUTHORS README COPYING doc/index.html doc/imlib2.gif doc/blank.gif
 %{_libdir}/lib*.so.*
 %{_bindir}/imlib2_*
 %{_datadir}/imlib2
@@ -95,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,0755)
 %{_bindir}/imlib2-config
 %{_libdir}/libImlib2.so
-%{_libdir}/*.a
+#{_libdir}/*.a
 %{_libdir}/pkgconfig/imlib2.pc
 %{_includedir}/*
 
@@ -104,12 +128,21 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/imlib2/filters
 %{_libdir}/imlib2/filters/*.so
 
-%files loader
+%files loaders
 %defattr(-,root,root,0755)
 %dir %{_libdir}/imlib2/loaders
 %{_libdir}/imlib2/loaders/*.so
 
 %changelog
+* Sun Apr 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.4.3-1
+- new upstream release (includeing security fix CVE-2008-6079)
+- added Patch1 for CVE-2010-0991
+- added --disable-static to %%configure
+- renamed "loader" subpackage to "loaders"
+
+* Tue Oct 14 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.4.1-1
+- new upstream release (including security fix CVE-2008-2426)
+
 * Sun Sep 28 2008 Shu KONNO <owa@bg.wakwak.com> 1.2.2-1vl5
 - applied new versioning policy, spec in utf-8