diff --git a/libwps.spec b/libwps.spec index 2274849..1e84a5c 100644 --- a/libwps.spec +++ b/libwps.spec @@ -10,8 +10,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen -BuildRequires: libwpd-devel -BuildRequires: glibc-devel +BuildRequires: libwpd-devel BuildRequires: cppunit-devel @@ -22,8 +21,8 @@ Library that handles Microsoft Works documents. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libwpd-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libwpd-devel%{?_isa} Requires: pkgconfig @@ -35,7 +34,7 @@ developing applications that use %{name}. %package tools Summary: Tools to transform Works documents into other formats Group: Applications/Publishing -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description tools @@ -72,10 +71,10 @@ make install INSTALL="install -p" DESTDIR="%{buildroot}" find %{buildroot} -name '*.la' -exec rm -f {} ';' -rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/INSTALL +rm -rf %{buildroot}%{_defaultdocdir}/%{name}-%{version}/INSTALL -find %{buildroot}%{_docdir}/%{name}-%{version}/ -type d -exec chmod 755 {} + -find %{buildroot}%{_docdir}/%{name}-%{version}/ -type f -exec chmod 644 {} + +find %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ -type d -exec chmod 755 {} + +find %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ -type f -exec chmod 644 {} + %check @@ -94,16 +93,16 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%dir %{_docdir}/%{name}-%{version} +%dir %{_defaultdocdir}/%{name}-%{version} %{_libdir}/*.so.* -%{_docdir}/%{name}-%{version}/CHANGES -%{_docdir}/%{name}-%{version}/COPYING -%{_docdir}/%{name}-%{version}/CREDITS -%{_docdir}/%{name}-%{version}/README +%{_defaultdocdir}/%{name}-%{version}/CHANGES +%{_defaultdocdir}/%{name}-%{version}/COPYING +%{_defaultdocdir}/%{name}-%{version}/CREDITS +%{_defaultdocdir}/%{name}-%{version}/README %files devel %defattr(-,root,root,-) -%{_docdir}/%{name}-%{version}/HACKING +%{_defaultdocdir}/%{name}-%{version}/HACKING %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}* @@ -116,7 +115,7 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%{_docdir}/%{name}-%{version}/html/ +%{_defaultdocdir}/%{name}-%{version}/html/ %changelog