From: <den...@us...> - 2010-08-29 20:04:47
|
Revision: 295 http://stdair.svn.sourceforge.net/stdair/?rev=295&view=rev Author: denis_arnaud Date: 2010-08-29 20:04:40 +0000 (Sun, 29 Aug 2010) Log Message: ----------- [Branch 0.3.0] Took into account the feedback from the package review (https://bugzilla.redhat.com/show_bug.cgi?id=614036). Modified Paths: -------------- branches/stdair/0.3.0/main/stdair.spec Modified: branches/stdair/0.3.0/main/stdair.spec =================================================================== --- branches/stdair/0.3.0/main/stdair.spec 2010-08-28 22:06:59 UTC (rev 294) +++ branches/stdair/0.3.0/main/stdair.spec 2010-08-29 20:04:40 UTC (rev 295) @@ -15,6 +15,9 @@ BuildRequires: boost-devel BuildRequires: soci-mysql-devel +# When the extracc package will be approved, uncomment the following line +# (see https://bugzilla.redhat.com/show_bug.cgi?id=616881 for more details) +#BuildRequires: extracc-devel BuildRequires: cppunit-devel @@ -41,11 +44,8 @@ %package doc Summary: HTML documentation for the %{name} library Group: Documentation -%if 0%{?fedora} -BuildArch: noarch -BuildRequires: texlive-latex -%endif -%{?el5:BuildRequires: tetex-latex} +%{?fedora:BuildArch: noarch} +BuildRequires: tex(latex) BuildRequires: doxygen, ghostscript %description doc @@ -55,8 +55,10 @@ %prep %setup -q +# The INSTALL package is not relevant for RPM package users +# (e.g., see https://bugzilla.redhat.com/show_bug.cgi?id=489233#c4) +rm -f INSTALL # Fix some permissions and formats -rm -f INSTALL chmod -x AUTHORS ChangeLog COPYING NEWS README find . -type f -name '*.[hc]pp' -exec chmod 644 {} \; @@ -69,15 +71,21 @@ # On Fedora, the BuildRoot is automatically cleaned. Which is not the case for # RedHat. See: https://fedoraproject.org/wiki/Packaging/Guidelines#BuildRoot_tag %{?rhel:rm -rf $RPM_BUILD_ROOT} + make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -# remove unpackaged files from the buildroot + +# Remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la +# When the extracc package will be approved, the following line has to be removed rm -f $RPM_BUILD_ROOT%{_libdir}/libextracppunit.la + mkdir -p %{mydocs} mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs} +%if 0%{?rhel} %clean rm -rf $RPM_BUILD_ROOT +%endif %post -p /sbin/ldconfig @@ -110,6 +118,9 @@ %changelog +* Sun Aug 29 2010 Son Nguyen Kim <ngu...@gm...> 0.3.0-2 +- Integrated comments from the package review (#614036) + * Sun Aug 29 2010 Son Nguyen Kim <ngu...@gm...> 0.3.0-1 - Upstream update This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |