[cairo/f18] Minor spec file cleanup
Kalev Lember
kalev at fedoraproject.org
Thu Oct 25 17:32:15 UTC 2012
commit d8409769e9de6797a4fa2f10fd86ccabdb9a519e
Author: Kalev Lember <kalevlember at gmail.com>
Date: Thu Oct 25 19:17:55 2012 +0200
Minor spec file cleanup
Remove obsolete configure arguments and also clean out some cruft that
modern rpmbuild no longer needs.
cairo.spec | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/cairo.spec b/cairo.spec
index 894e872..a292b15 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -45,7 +45,6 @@ Requires: libpng-devel
Requires: pixman-devel >= %{pixman_version}
Requires: freetype-devel >= %{freetype_version}
Requires: fontconfig-devel >= %{fontconfig_version}
-Requires: pkgconfig
%description devel
Cairo is a 2D graphics library designed to provide high-quality display
@@ -69,7 +68,6 @@ integrate well with the GObject object system used by GNOME.
Summary: Development files for cairo-gobject
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
-Requires: pkgconfig
%description gobject-devel
Cairo is a 2D graphics library designed to provide high-quality display
@@ -94,9 +92,8 @@ This package contains tools for working with the cairo graphics library.
%build
%configure --disable-static \
- --enable-warnings \
--enable-xlib \
- --enable-freetype \
+ --enable-ft \
--enable-ps \
--enable-pdf \
--enable-svg \
@@ -109,14 +106,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make V=1 %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
make install V=1 DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -124,14 +116,12 @@ rm -rf $RPM_BUILD_ROOT
%postun gobject -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc AUTHORS BIBLIOGRAPHY BUGS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 NEWS README
%{_libdir}/libcairo.so.*
%{_libdir}/libcairo-script-interpreter.so.*
%{_bindir}/cairo-sphinx
%files devel
-%defattr(-,root,root,-)
%doc ChangeLog PORTING_GUIDE
%dir %{_includedir}/cairo/
%{_includedir}/cairo/cairo-deprecated.h
@@ -170,17 +160,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/cairo
%files gobject
-%defattr(-,root,root,-)
%{_libdir}/libcairo-gobject.so.*
%files gobject-devel
-%defattr(-,root,root,-)
%{_includedir}/cairo/cairo-gobject.h
%{_libdir}/libcairo-gobject.so
%{_libdir}/pkgconfig/cairo-gobject.pc
%files tools
-%defattr(-,root,root,-)
%{_bindir}/cairo-trace
%{_libdir}/cairo/
More information about the scm-commits
mailing list