[Stdair-svn] SF.net SVN: stdair:[278] trunk/stdair/stdair.spec

[<den...@us...>]

Revision: 278
          http://stdair.svn.sourceforge.net/stdair/?rev=278&view=rev
Author:   denis_arnaud
Date:     2010-08-21 20:10:15 +0000 (Sat, 21 Aug 2010)

Log Message:
-----------
[Packaging] Took into account latest RPM guidelines.

Modified Paths:
--------------
    trunk/stdair/stdair.spec

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-08-20 19:06:52 UTC (rev 277)
+++ trunk/stdair/stdair.spec	2010-08-21 20:10:15 UTC (rev 278)
@@ -15,8 +15,8 @@
 
 BuildRequires:  boost-devel
 BuildRequires:  cppunit-devel
-#Requires:       
 
+
 %description
 %{name} aims at providing a clean API, and the corresponding C++
 implementation, for the basis of Airline IT Business Object Model (BOM),
@@ -42,13 +42,10 @@
 %package doc
 Summary:        HTML documentation for the %{name} library
 Group:          Documentation
-%if 0%{?fedora} >= 10
+%if 0%{?fedora}
 BuildArch:      noarch
 BuildRequires:  texlive-latex
 %endif
-%if 0%{?fedora} < 10
-BuildRequires:  tetex-latex
-%endif
 %{?el5:BuildRequires: tetex-latex}
 BuildRequires:  doxygen, ghostscript
 
@@ -71,8 +68,10 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+# On Fedora, the BuildRoot is automatically cleaned. Which is not the case for
+# RedHat. See: https://fedoraproject.org/wiki/Packaging/Guidelines#BuildRoot_tag
+%if %{?rhel:rm -rf $RPM_BUILD_ROOT}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.