small spec file cleanups

This commit is contained in:
Matthias Clasen 2006-12-09 06:28:34 +00:00
parent 7b534a392a
commit ee5b607091

View File

@ -4,18 +4,17 @@
Summary: A vector graphics library Summary: A vector graphics library
Name: cairo Name: cairo
Version: 1.3.6 Version: 1.3.6
Release: 1%{?dist} Release: 2%{?dist}
URL: http://cairographics.org URL: http://cairographics.org
Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz
License: LGPL/MPL License: LGPL/MPL
Group: System Environment/Libraries Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: libpixman <= 0.1.6 Obsoletes: libpixman <= 0.1.6
Obsoletes: libpixman-devel <= 0.1.6 Obsoletes: libpixman-devel <= 0.1.6
Obsoletes: libpixman-debuginfo <= 0.1.6 Obsoletes: libpixman-debuginfo <= 0.1.6
Requires: /sbin/ldconfig
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libXrender-devel BuildRequires: libXrender-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -52,8 +51,13 @@ source vector graphics library.
%setup -q %setup -q
%build %build
%configure --enable-warnings --enable-xlib --enable-freetype \ %configure --disable-static \
--enable-ps --enable-pdf --enable-svg \ --enable-warnings \
--enable-xlib \
--enable-freetype \
--enable-ps \
--enable-pdf \
--enable-svg \
--disable-gtk-doc --disable-gtk-doc
make make
@ -62,7 +66,6 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/*.a
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -72,8 +75,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO %doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libcairo*.so.* %{_libdir}/libcairo*.so.*
%files devel %files devel
@ -81,9 +83,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/* %{_includedir}/*
%{_libdir}/libcairo*.so %{_libdir}/libcairo*.so
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%{_datadir}/gtk-doc/* %{_datadir}/gtk-doc/html/cairo
%changelog %changelog
* Sat Dec 9 2006 Matthias Clasen <mclasen@redhat.com> 1.3.6-2
- Small spec file cleanups
* Wed Dec 6 2006 Matthias Clasen <mclasen@redhat.com> 1.3.6-1 * Wed Dec 6 2006 Matthias Clasen <mclasen@redhat.com> 1.3.6-1
- Update to 1.3.6 - Update to 1.3.6
@ -252,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Nov 16 2004 Kristian Høgsberg <krh@redhat.com> - 0.2.0-1 * Tue Nov 16 2004 Kristian Høgsberg <krh@redhat.com> - 0.2.0-1
- Incorporate changes suggested by katzj: Require: ldconfig and run it - Incorporate changes suggested by katzj: Require: ldconfig and run it
in %post and %postun, don't pass CFLAGS to make. in %%post and %%postun, don't pass CFLAGS to make.
* Mon Aug 9 2004 Kristian Høgsberg <krh@redhat.com> - 0.2.0-1 * Mon Aug 9 2004 Kristian Høgsberg <krh@redhat.com> - 0.2.0-1
- Update license, explicitly disable glitz. - Update license, explicitly disable glitz.