[pstoedit/f16] 3.60

[Jiří Popelka]

commit 67b145414af41e708b3db55da639401ff6272da7
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Aug 29 15:35:47 2011 +0200

    3.60
    
    All patches merged upstream.
    Removed Rpath
    Cleanup spec file

 .gitignore                   |    1 +
 pstoedit-3.44-cxxflags.patch |   13 ----
 pstoedit-3.45-asy.patch      |  149 ------------------------------------------
 pstoedit-3.45-build.patch    |   35 ----------
 pstoedit-3.45-elif.patch     |   11 ---
 pstoedit-3.45-gcc43.patch    |   12 ----
 pstoedit-3.45-quiet.patch    |   49 --------------
 pstoedit.spec                |   54 ++++++---------
 sources                      |    2 +-
 9 files changed, 24 insertions(+), 302 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f4b545..00669ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pstoedit-3.45.tar.gz
+/pstoedit-3.60.tar.gz
diff --git a/pstoedit.spec b/pstoedit.spec
index 821fa4e..48d8b56 100644
--- a/pstoedit.spec
+++ b/pstoedit.spec
@@ -1,28 +1,21 @@
 Name:           pstoedit
-Version:        3.45
-Release:        10%{?dist}
+Version:        3.60
+Release:        1%{?dist}
 Summary:        Translates PostScript and PDF graphics into other vector formats
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.pstoedit.net/
-Source0:        http://download.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz
-Patch0:		pstoedit-3.44-cxxflags.patch
-Patch1:		pstoedit-3.45-quiet.patch
-Patch2:		pstoedit-3.45-gcc43.patch
-Patch3:         pstoedit-3.45-asy.patch
-Patch4:         pstoedit-3.45-elif.patch
-# Patch5: fix parallel build
-Patch5:         pstoedit-3.45-build.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	ghostscript
-BuildRequires:	gd-devel
-BuildRequires:	libpng-devel
-BuildRequires:	dos2unix
-BuildRequires:	ghostscript
-BuildRequires:	plotutils-devel
+Source0:        http://downloads.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz
+
+Requires:       ghostscript
+BuildRequires:  gd-devel
+BuildRequires:  libpng-devel
+BuildRequires:  dos2unix
+BuildRequires:  ghostscript
+BuildRequires:  plotutils-devel
 %ifnarch ia64
-BuildRequires:	libEMF-devel
+BuildRequires:  libEMF-devel
 %endif
 
 
@@ -37,7 +30,7 @@ drivers
 Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	libpng-devel
+Requires:       libpng-devel
 
 %description devel
 This package contains the header files needed for developing %{name}
@@ -46,33 +39,28 @@ applications
 
 %prep
 %setup -q
-%patch0 -p1 -b .cxxflags
-%patch1 -p1 -b .quiet
-%patch2 -p1 -b .gcc43
-%patch3 -p1 -b .asy
-%patch4 -p1 -b .elif
-%patch5 -p1 -b .build
+
 dos2unix doc/*.htm doc/readme.txt
 
 
 %build
 # Buildling without ImageMagick support, to work around bug 507035
 %configure --disable-static --with-emf --without-swf --without-magick
+
+# http://fedoraproject.org/wiki/Packaging/Guidelines#Removing_Rpath
+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
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 644 doc/pstoedit.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 
 
@@ -80,7 +68,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-, root, root, -)
 %doc copying doc/readme.txt doc/index.htm doc/pstoedit.htm
 %{_datadir}/pstoedit
 %{_mandir}/man1/*
@@ -90,7 +77,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-, root, root, -)
 %doc doc/changelog.htm
 %{_includedir}/pstoedit
 %{_libdir}/*.so
@@ -99,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 29 2011 Jiri Popelka <jpopelka at redhat.com> - 3.60-1
+- Update to new upstream 3.60, bugfix release
+- Remove Rpath
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.45-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index fe0cd89..e40b9a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-071efc64d9edf5d942b407348ac7451d  pstoedit-3.45.tar.gz
+1bd14f33c1cf57bf6880e2f8f3f93080  pstoedit-3.60.tar.gz