[cairomm/f16] Modernize the spec file
Kalev Lember
kalev at fedoraproject.org
Sat Jul 30 01:21:54 UTC 2011
commit 06d96df649952fdf50116abfaf1187721dbdbc9f
Author: Kalev Lember <kalevlember at gmail.com>
Date: Fri Jul 29 04:51:13 2011 +0300
Modernize the spec file
cairomm.spec | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/cairomm.spec b/cairomm.spec
index 21f7ec2..683f8b3 100644
--- a/cairomm.spec
+++ b/cairomm.spec
@@ -9,7 +9,6 @@ URL: http://www.cairographics.org
License: LGPLv2+
Group: System Environment/Libraries
Source: http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cairo-devel >= %{cairover}
BuildRequires: pkgconfig
BuildRequires: libsigc++20-devel
@@ -24,7 +23,6 @@ Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: cairo-devel >= %{cairover}
-Requires: pkgconfig
Requires: libsigc++20-devel
%description devel
@@ -35,13 +33,10 @@ Standard Template Library where it makes sense.
This package contains the libraries and header files needed for
developing %{name} applications.
-%package doc
-Summary: Developer's documentation for the cairomm library
-Group: Documentation
-%if 0%{?fedora} > 9 || 0%{?rhel} > 5
-BuildArch: noarch
-%endif
-BuildRequires: doxygen graphviz
+%package doc
+Summary: Developer's documentation for the cairomm library
+Group: Documentation
+BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: libsigc++20-doc
@@ -59,29 +54,22 @@ hierarchy and can be found at /usr/share/doc/cairomm-1.0
%setup -q
%build
-%configure --enable-static=no
-%{__make} %{?_smp_mflags}
+%configure --disable-static
+make %{?_smp_mflags}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
%{_libdir}/lib*.so.*
%files devel
-%defattr(-,root,root,-)
%doc ChangeLog
%{_includedir}/%{name}-%{apiver}
%{_libdir}/*.so
@@ -89,7 +77,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%{_libdir}/%{name}-%{apiver}
%files doc
-%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}-%{apiver}/
%doc %{_datadir}/devhelp/books/%{name}-%{apiver}/
@@ -97,6 +84,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
* Fri Jul 29 2011 Kalev Lember <kalevlember at gmail.com> - 1.10.0-1
- Update to 1.10.0
- Have the -doc subpackage depend on the base package
+- Modernize the spec file
* Mon Feb 21 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1.9.8-2
- fix documentation location
More information about the scm-commits
mailing list