From 050a0083679fd13690f5b66e2a3383d722d9b276 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Sun, 28 Nov 2004 04:36:14 +0000
Subject: [PATCH] Sync with autotrace-0.31.1-0.fdr.3 from Marius.

---
 autotrace.spec | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/autotrace.spec b/autotrace.spec
index 8de4a70..3a8a9bb 100644
--- a/autotrace.spec
+++ b/autotrace.spec
@@ -1,17 +1,20 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        0.fdr.1.1.90
+Release:        3
 Epoch:          0
 Summary:        A utility for converting bitmaps to vector graphics
 
 Group:          Applications/Multimedia
 License:        GPL/LGPL
 URL:            http://autotrace.sourceforge.net/
-Source0:        http://download.sourceforge.net/autotrace/autotrace-0.31.1.tar.gz
+Source0:        http://dl.sf.net/autotrace/autotrace-0.31.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ImageMagick-devel
 BuildRequires:  XFree86-devel
 BuildRequires:  libpng-devel > 2:1.2
+BuildRequires:  libexif-devel
+#BuildRequires:  pstoedit-devel
+BuildConflicts: pstoedit-devel
 
 %description
 AutoTrace is a program similar to CorelTrace or Adobe Streamline for
@@ -25,26 +28,35 @@ Postscript, SVG, xfig, SWF, and others.
 Summary:        Header files and static libraries for autotrace
 Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       pkgconfig
+Requires:       ImageMagick-devel
+#Requires:       pstoedit-devel
 
+ 
 %description devel
 This package contains header files and static libraries for autotrace.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO
@@ -62,7 +74,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/autotrace/
 %{_datadir}/aclocal/*.m4
 
+
 %changelog
+* Sat Aug 21 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.31.1-3
+- Temporarily changed buildreq pstoedit-devel to buildconflicts.
+
+* Thu Apr 22 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.31.1-0.fdr.2
+- Added new BuildReq pstoedit-devel.
+- Added missing BuildReq libexif-devel.
+- Added missing -devel requires pkgconfig, ImageMagick-devel.
+- Converted spec file to UTF-8.
+
 * Mon Sep 29 2003 Marius L. Johndal <mariuslj at ifi.uio.no> 0:0.31.1-0.fdr.1
 - Initial RPM release.