[psiconv/f17] rebuild for new ImageMagick

Tom Callaway spot at fedoraproject.org
Fri Apr 13 15:44:57 UTC 2012


commit f9c7237b58e069a402bf77ff36a1c132d5fabfc2
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Apr 13 11:44:54 2012 -0400

    rebuild for new ImageMagick

 psiconv.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/psiconv.spec b/psiconv.spec
index dc3686c..bc2504d 100644
--- a/psiconv.spec
+++ b/psiconv.spec
@@ -1,14 +1,11 @@
 Name:		psiconv
 Version:	0.9.8
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A conversion utility for Psion files
-
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://software.frodo.looijaard.name/psiconv/
 Source0:	http://software.frodo.looijaard.name/psiconv/files/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	ImageMagick-devel
 BuildRequires:	bc
 #Requires:       
@@ -19,7 +16,7 @@ A conversion utility for the Psion files
 %package devel
 Summary:	Development files for psiconv
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Contains library and header files for psiconv
@@ -30,24 +27,22 @@ Contains library and header files for psiconv
 
 %build
 %configure --disable-static
+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
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 mv $RPM_BUILD_ROOT%{_datadir}/%{name} _doc
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING NEWS README TODO ChangeLog AUTHORS 
 %dir %{_sysconfdir}/psiconv
 %config %{_sysconfdir}/psiconv/psiconv.conf 
@@ -59,7 +54,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc _doc/*
 %{_bindir}/psiconv-config
 %{_mandir}/man1/psiconv-config.1.gz
@@ -69,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 13 2012 Tom Callaway <spot at fedoraproject.org> - 0.9.8-10
+- rebuild for new ImageMagick
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list