rpms/liborigin2/devel liborigin2.spec,1.1,1.2

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/liborigin2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28236

Modified Files:
	liborigin2.spec 
Log Message:



Index: liborigin2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liborigin2/devel/liborigin2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- liborigin2.spec	27 Jan 2010 05:13:05 -0000	1.1
+++ liborigin2.spec	17 Apr 2010 01:58:30 -0000	1.2
@@ -29,7 +29,8 @@ See http://www.originlab.com for more in
 %package devel
 Summary:		Development files for %{name}
 Group:			Development/Libraries
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name}%{?_isa} = %{version}-%{release}
+Requires:		boost-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains libraries and header files for 
@@ -59,7 +60,7 @@ find . -type f -exec chmod 0644 {} \;
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
-%_qt4_qmake ORIDOCDIR=%{_docdir}/%{name}-%{version} LIBDIR=%{_libdir} \
+%_qt4_qmake ORIDOCDIR=%{_defaultdocdir}/%{name}-%{version} LIBDIR=%{_libdir} \
 	BOOSTINC=%{_includedir}/boost
 make %{?_smp_mflags}
 pushd doc
@@ -83,10 +84,10 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%dir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/copying
-%{_docdir}/%{name}-%{version}/readme
-%{_docdir}/%{name}-%{version}/FORMAT
+%dir %{_defaultdocdir}/%{name}-%{version}
+%{_defaultdocdir}/%{name}-%{version}/copying
+%{_defaultdocdir}/%{name}-%{version}/readme
+%{_defaultdocdir}/%{name}-%{version}/FORMAT
 %{_libdir}/%{name}.so.1*
 
 %files devel
@@ -96,13 +97,15 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}/html
+%{_defaultdocdir}/%{name}-%{version}/html
 
 %changelog
-* Sat Jan 23 2010 Chen Lei <supercyper AT 163 DOT com> - 06042009-2.20100119svn
+* Sat Jan 23 2010 Chen Lei <supercyper at 163.com> - 06042009-2.20100119svn
 - svn 1552
 - split doc subpackage
-* Wed Nov 25 2009 Chen Lei <supercyper AT 163 DOT com> - 06042009-1
+
+* Wed Nov 25 2009 Chen Lei <supercyper at 163.com> - 06042009-1
 - add API documentation
-* Sat Nov 21 2009 Chen Lei <supercyper AT 163 DOT com> - 06042009-0
+
+* Sat Nov 21 2009 Chen Lei <supercyper at 163.com> - 06042009-0
 - initial rpm build