rpms/GraphicsMagick/devel GraphicsMagick.spec,1.30,1.31
Rex Dieter
rdieter at fedoraproject.org
Fri Nov 6 14:33:48 UTC 2009
- Previous message: rpms/bitfrost/F-11 .cvsignore, 1.1, 1.2 bitfrost.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/perl-libwww-perl/devel .cvsignore, 1.16, 1.17 perl-libwww-perl.spec, 1.35, 1.36 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18635
Modified Files:
GraphicsMagick.spec
Log Message:
* Fri Nov 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-2
- cleanup/uncruftify .spec
Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- GraphicsMagick.spec 18 Sep 2009 01:25:00 -0000 1.30
+++ GraphicsMagick.spec 6 Nov 2009 14:33:47 -0000 1.31
@@ -2,7 +2,7 @@
Summary: An ImageMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
Version: 1.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: Applications/Multimedia
Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
@@ -101,27 +101,24 @@ mv -f ChangeLog.utf8 ChangeLog
# Avoid lib64 rpaths (FIXME: recheck this on newer releases)
%if "%{_libdir}" != "/usr/lib"
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif
%build
-%configure --enable-shared \
+%configure --enable-shared --disable-static \
+ --with-lcms \
+ --with-magick_plus_plus \
--with-modules \
--with-perl \
- --with-x \
+ --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix}" \
--with-threads \
- --with-magick_plus_plus \
- --without-gslib \
+ --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
--with-wmf \
- --with-lcms \
+ --with-x \
--with-xml \
- --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \
- --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \
- --without-dps
-
-# Avoid bogus RPATHs on x86_64
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+ --without-dps \
+ --without-gslib
make %{?_smp_mflags}
make %{?_smp_mflags} perl-build
@@ -136,9 +133,9 @@ make install DESTDIR=%{buildroot} -C Per
# perlmagick: fix perl path of demo files
%{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl
-find %{buildroot} -name "*.bs" |xargs rm -f
-find %{buildroot} -name ".packlist" |xargs rm -f
-find %{buildroot} -name "perllocal.pod" |xargs rm -f
+find %{buildroot} -name "*.bs" |xargs rm -fv
+find %{buildroot} -name ".packlist" |xargs rm -fv
+find %{buildroot} -name "perllocal.pod" |xargs rm -fv
chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so
@@ -158,9 +155,7 @@ fi
rm -rf %{buildroot}%{_datadir}/GraphicsMagick
# Keep config
rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]*
-rm -rf %{buildroot}%{_libdir}/libltdl.*
-rm -f %{buildroot}%{_libdir}/GraphicsMagick-*/modules*/*/*.a
-rm -f %{buildroot}%{_libdir}/*.{a,la}
+rm -vf %{buildroot}%{_libdir}/lib*.la
# fix multilib issues
%ifarch x86_64 s390x ia64 ppc64 sparc64
@@ -247,6 +242,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Nov 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-2
+- cleanup/uncruftify .spec
+
* Thu Sep 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3.7-1
- GraphicsMagick-1.3.7
- Previous message: rpms/bitfrost/F-11 .cvsignore, 1.1, 1.2 bitfrost.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/perl-libwww-perl/devel .cvsignore, 1.16, 1.17 perl-libwww-perl.spec, 1.35, 1.36 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list