Hello community, here is the log from the commit of package imlib2 for openSUSE:Factory checked in at 2012-01-11 15:36:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imlib2 (Old) and /work/SRC/openSUSE:Factory/.imlib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imlib2", Maintainer is "meiss...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/imlib2/imlib2.changes 2011-11-22 17:47:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.imlib2.new/imlib2.changes 2012-01-11 15:37:54.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Jan 10 03:00:01 UTC 2012 - crrodrig...@opensuse.org + +- Cleanup total dependency madness here: + * Add explicit BuildRequires on libjpeg-devel,zlib-devel, + libid3tag-devel. + * Do not use catch-all xorg-x11-devel, but only + xorg-x11-libX11-devel, xorg-x11-libXext-devel + * imlib2-devel only requires xorg-x11-libX11-devel + * Axe all "la" files, there is no libltdl usage. + * cleanup imlib-config script at build time. + * This will certainly break build of dependenant packages + with broken BuildRequires, drop me a note if you find + any problem. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.iAILA1/_old 2012-01-11 15:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.iAILA1/_new 2012-01-11 15:37:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package imlib2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,18 +18,26 @@ Name: imlib2 -%define lname libImlib2-1 -BuildRequires: freetype2-devel giflib-devel libpng-devel libtiff-devel xorg-x11-devel -BuildRequires: libtool -Summary: Image handling and conversion library. Version: 1.4.5 Release: 1 License: BSD-3-Clause +Summary: Image handling and conversion library +Url: http://sourceforge.net/projects/enlightenment/ Group: Development/Libraries/X11 -Source: %name-%version.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -URL: http://sourceforge.net/projects/enlightenment/ +Source: %{name}-%{version}.tar.bz2 +%define lname libImlib2-1 +BuildRequires: freetype2-devel +BuildRequires: giflib-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libtool +BuildRequires: xorg-x11-libX11-devel +BuildRequires: xorg-x11-libXext-devel +BuildRequires: libjpeg-devel +BuildRequires: zlib-devel +BuildRequires: libid3tag-devel Recommends: imlib2-loaders +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Imlib2 is an advanced replacement library for libraries like libXpm @@ -39,7 +47,7 @@ and more. %package -n %lname -Summary: Image handling and conversion library. +Summary: Image handling and conversion library Group: System/Libraries %description -n %lname @@ -52,7 +60,8 @@ %package devel Summary: Imlib 2 - development libraries Group: Development/Libraries/X11 -Requires: %lname = %version, glibc-devel xorg-x11-devel freetype2-devel zlib-devel libpng-devel +Requires: %lname = %{version} +Requires: xorg-x11-libX11-devel %description devel These are the development headers and library for imlib2. @@ -60,7 +69,7 @@ %package filters Summary: Imlib 2 - plugin filters Group: Development/Libraries/X11 -Requires: %lname = %version +Requires: %lname = %{version} %description filters This package has the basic set of plugin filters that come with Imlib2. @@ -68,7 +77,17 @@ %package loaders Summary: Imlib 2 - image loaders Group: Development/Libraries/X11 -Provides: imlib2-loader_jpeg imlib2-loader_png imlib2-loader_argb imlib2-loader_tiff imlib2-loader_gif imlib2-loader_zlib imlib2-loader_bz2 imlib2-loader_pnm imlib2-loader_bmp imlib2-loader_xpm imlib2-loader_tga +Provides: imlib2-loader_argb +Provides: imlib2-loader_bmp +Provides: imlib2-loader_bz2 +Provides: imlib2-loader_gif +Provides: imlib2-loader_jpeg +Provides: imlib2-loader_png +Provides: imlib2-loader_pnm +Provides: imlib2-loader_tga +Provides: imlib2-loader_tiff +Provides: imlib2-loader_xpm +Provides: imlib2-loader_zlib %description loaders This package contains the imlib2 image loaders for: argb, bmp, gif, @@ -79,7 +98,7 @@ %build autoreconf --force --install -%configure --prefix=%{_prefix} \ +%configure \ %ifarch %ix86 --enable-mmx \ %else @@ -97,15 +116,16 @@ make %{?_smp_mflags} V=1 %install -make DESTDIR=$RPM_BUILD_ROOT install -pushd $RPM_BUILD_ROOT%_bindir/ +%make_install +pushd %{buildroot}%{_bindir}/ for i in *imlib2-config ; do test "$i" != "imlib2-config" || continue ln -s $i imlib2-config done popd -# find $RPM_BUILD_ROOT -name \*.la | xargs perl -pi -e "s@$RPM_BUILD_DIR@.@g" -# find $RPM_BUILD_ROOT/%{_libdir}/imlib2_loaders -name \*.la | xargs rm +find %{buildroot} -type f -name "*.la" -print -delete +#Heads up ! clean up madness here.. +sed -i -e 's@-lfreetype@@g' -e 's@-lz@@g' -e 's@-lXext@@g' -e 's@-ldl@@g' -e 's@-lm@@g' %{buildroot}%{_bindir}/imlib2-config %post -n %lname -p /sbin/ldconfig @@ -115,28 +135,27 @@ %defattr(-,root,root,0755) %doc AUTHORS README COPYING doc/index.html %doc doc/imlib2.gif doc/blank.gif -%_bindir/imlib2_bumpmap -%_bindir/imlib2_colorspace -%_bindir/imlib2_conv -%_bindir/imlib2_poly -%_bindir/imlib2_show -%_bindir/imlib2_test -%_bindir/imlib2_view -%_bindir/imlib2_grab -%attr(755,root,root) %dir %{_prefix}/share/imlib2 -%{_prefix}/share/imlib2/* +%{_bindir}/imlib2_bumpmap +%{_bindir}/imlib2_colorspace +%{_bindir}/imlib2_conv +%{_bindir}/imlib2_poly +%{_bindir}/imlib2_show +%{_bindir}/imlib2_test +%{_bindir}/imlib2_view +%{_bindir}/imlib2_grab +%attr(755,root,root) %dir %{_datadir}/imlib2 +%{_datadir}/imlib2/* %files -n %lname %defattr(-,root,root) -%_libdir/libImlib2.so.1* +%{_libdir}/libImlib2.so.1* %files devel %defattr(-,root,root,0755) -%_libdir/*.la -%_libdir/pkgconfig/imlib2.pc -%_includedir/* -%_libdir/lib*.so -%_bindir/imlib2-config +%{_libdir}/pkgconfig/imlib2.pc +%{_includedir}/* +%{_libdir}/lib*.so +%{_bindir}/imlib2-config %files filters %attr(755,root,root) %dir %{_libdir}/imlib2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
