rpms/imlib2/F-8 .cvsignore, 1.7, 1.8 imlib2-1.3.0-multilib.patch, 1.1, 1.2 imlib2.spec, 1.30, 1.31 sources, 1.8, 1.9

[Tomas Smetana]

Author: tsmetana

Update of /cvs/pkgs/rpms/imlib2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3784

Modified Files:
	.cvsignore imlib2-1.3.0-multilib.patch imlib2.spec sources 
Log Message:
* Thu Oct 23 2008 Tomas Smetana <tsmetana at redhat.com> 1.4.2-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	27 May 2007 20:34:16 -0000	1.7
+++ .cvsignore	23 Oct 2008 08:56:17 -0000	1.8
@@ -1 +1 @@
-imlib2-1.4.0.tar.gz
+imlib2-1.4.2.tar.bz2

imlib2-1.3.0-multilib.patch:

Index: imlib2-1.3.0-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-8/imlib2-1.3.0-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imlib2-1.3.0-multilib.patch	26 Oct 2006 22:22:38 -0000	1.1
+++ imlib2-1.3.0-multilib.patch	23 Oct 2008 08:56:17 -0000	1.2
@@ -1,25 +1,3 @@
---- imlib2-1.3.0/configure.in~	2006-10-27 00:18:39.000000000 +0200
-+++ imlib2-1.3.0/configure.in	2006-10-27 00:18:39.000000000 +0200
-@@ -190,7 +190,7 @@
-   AC_PATH_XTRA
-   x_dir=${x_dir:-/usr/X11R6}
-   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+  x_libs="-lX11 -lXext"
-   AM_CONDITIONAL(BUILD_X11, true)
-   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
- else
---- imlib2-1.3.0/configure~	2006-10-27 00:18:25.000000000 +0200
-+++ imlib2-1.3.0/configure	2006-10-27 00:18:25.000000000 +0200
-@@ -23117,7 +23117,7 @@
- 
-   x_dir=${x_dir:-/usr/X11R6}
-   x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
--  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
-+  x_libs="-lX11 -lXext"
- 
- 
- if true; then
 --- imlib2-1.3.0/imlib2-config.in~	2006-10-27 00:17:29.000000000 +0200
 +++ imlib2-1.3.0/imlib2-config.in	2006-10-27 00:17:29.000000000 +0200
 @@ -45,8 +45,7 @@


Index: imlib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-8/imlib2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- imlib2.spec	30 May 2008 10:38:11 -0000	1.30
+++ imlib2.spec	23 Oct 2008 08:56:17 -0000	1.31
@@ -1,15 +1,12 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
-Version:        1.4.0
-Release:        7%{?dist}
+Version:        1.4.2
+Release:        1%{?dist}
 License:        Imlib2
 Group:          System Environment/Libraries
 URL:            http://docs.enlightenment.org/api/imlib2/html/
-Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0:         imlib2-1.2.1-X11-path.patch
-Patch1:         imlib2-1.3.0-multilib.patch
-Patch2:         imlib2-1.3.0-loader_overflows.patch
-Patch3:         imlib2-1.4.0-CVE-2008-2426.patch
+Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
+Patch0:         imlib2-1.3.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
@@ -58,15 +55,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .x11-path
-%patch1 -p1 -b .multilib
-%patch2 -p1 -b .overflow
-%patch3 -p1 -b .CVE-2008-2426
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch config.h.in
-touch `find -name Makefile.in`
+%patch0 -p1 -b .multilib
 
 
 %build
@@ -75,15 +64,18 @@
 asmopts="--enable-mmx --disable-amd64"
 %endif
 
-# Note: --disable-static doesn't work as of 1.2.1.
+export x_libs=" "
 %configure --disable-dependency-tracking --with-pic $asmopts
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
 
+
 rm -f \
   $RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \
   $RPM_BUILD_ROOT%{_bindir}/imlib2_test
@@ -130,6 +122,9 @@
 %{_libdir}/imlib2/loaders/id3.*
 
 %changelog
+* Thu Oct 23 2008 Tomas Smetana <tsmetana at redhat.com> 1.4.2-1
+- new upstream version
+
 * Fri May 30 2008 Tomas Smetana <tsmetana at redhat.com> 1.4.0-7
 - patch for CVE-2008-2426
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imlib2/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	27 May 2007 20:34:16 -0000	1.8
+++ sources	23 Oct 2008 08:56:17 -0000	1.9
@@ -1 +1 @@
-69f7ee996c943142332b4c98597b095c  imlib2-1.4.0.tar.gz
+9f15568e76ebda9092c571e0df261f54  imlib2-1.4.2.tar.bz2