rpms/autotrace/F-10 autotrace-0.31.1-GetOnePixel.patch, NONE, 1.1 autotrace-aclocal18.patch, NONE, 1.1 import.log, NONE, 1.1 autotrace.spec, 1.20, 1.21

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/autotrace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1221/F-10

Modified Files:
	autotrace.spec 
Added Files:
	autotrace-0.31.1-GetOnePixel.patch autotrace-aclocal18.patch 
	import.log 
Log Message:
fixed rhbz# 477980

autotrace-0.31.1-GetOnePixel.patch:
 input-magick.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE autotrace-0.31.1-GetOnePixel.patch ---
diff -ru autotrace-0.31.1.orig/input-magick.c autotrace-0.31.1/input-magick.c
--- autotrace-0.31.1.orig/input-magick.c	2009-03-02 12:08:45.000000000 +0000
+++ autotrace-0.31.1/input-magick.c	2009-03-02 12:12:21.000000000 +0000
@@ -83,7 +83,11 @@
 
   for(j=0,runcount=0,point=0;j<image->rows;j++)
     for(i=0;i<image->columns;i++) {
+#if (MagickLibVersion < 0x0645) || (MagickLibVersion >= 0x0649)
       p=GetOnePixel(image,i,j);
+#else
+      GetOnePixel(image,i,j,pixel);
+#endif
       AT_BITMAP_BITS(bitmap)[point++]=pixel->red; /* if gray: red=green=blue */
       if(np==3) {
         AT_BITMAP_BITS(bitmap)[point++]=pixel->green;

autotrace-aclocal18.patch:
 autotrace.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autotrace-aclocal18.patch ---
--- autotrace.m4~	2002-10-10 23:44:12.000000000 +0300
+++ autotrace.m4	2005-05-22 22:17:06.000000000 +0300
@@ -4,7 +4,7 @@
 dnl AM_PATH_AUTOTRACE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test to see if libautotrace is installed, and define AUTOTRACE_CFLAGS, LIBS
 dnl
-AC_DEFUN(AM_PATH_AUTOTRACE,
+AC_DEFUN([AM_PATH_AUTOTRACE],
 [dnl
 dnl Get the cflags and libraries from the autotrace-config script
 dnl

 	  	 


--- NEW FILE import.log ---
autotrace-0_31_1-23_fc11:F-10:autotrace-0.31.1-23.fc11.src.rpm:1248705023


Index: autotrace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autotrace/F-10/autotrace.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- autotrace.spec	14 Jul 2008 19:20:55 -0000	1.20
+++ autotrace.spec	27 Jul 2009 14:31:16 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        18%{?dist}
+Release:        23%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -20,6 +20,9 @@ BuildRequires:  freetype-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
+Patch0:         autotrace-0.31.1-GetOnePixel.patch
+Patch1:		autotrace-aclocal18.patch
+
 %description
 AutoTrace is a program similar to CorelTrace or Adobe Streamline for
 converting bitmaps to vector graphics.
@@ -43,7 +46,8 @@ This package contains header files and s
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .GetOnePixel
+%patch1 -p0 -b .aclocal18
 
 %build
 %configure
@@ -52,9 +56,10 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 
 %clean
@@ -78,7 +83,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc HACKING
 %{_bindir}/autotrace-config
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/autotrace/
@@ -86,6 +90,23 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 27 2009 Peter Lemenkov <lemenkov at gmail.com> - 0.31.1-23
+- Removed static libraries from -devel
+- Changed %%makeinstall to "make install DESTDIR=blablabla"
+- Fixed rhbz# 477980
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31.1-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 13 2009 Hans de Goede <hdegoede at redhat.com> - 0.31.1-21
+- Rebuild for new ImageMagick
+
+* Mon Mar 02 2009 Caolán McNamara <caolanm at redhat.com> - 0.31.1-20
+- Modify GetOnePixel usage to build against current ImageMagick api
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.31.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Jul 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.31.1-18
 - fix license tag