diff --git a/.gitignore b/.gitignore index 52a5bd7..783702d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ /noarch/ /x86_64/ /i?86/ - +/tarballs/ diff --git a/stdair.spec b/stdair.spec index a63bf16..b2e8269 100644 --- a/stdair.spec +++ b/stdair.spec @@ -3,7 +3,7 @@ # Name: stdair Version: 1.00.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ Standard Airline IT Object Library @@ -75,6 +75,10 @@ mkdir -p %{mydocs} mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs} rm -f %{mydocs}/html/installdox +# Remove additional documentation files (those files are already available +# in the project top directory) +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{NEWS,README,AUTHORS} + %check ctest @@ -88,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc ChangeLog COPYING AUTHORS NEWS README %{_bindir}/%{name} %{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}uicl.so.* @@ -140,7 +144,11 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Jul 27 2013 pmachata@redhat.com - 1.00.1-6 +* Mon Jul 29 2013 Denis Arnaud - 1.00.1-7 +- Fixed the docdir issue, following the F20 System Wide Change +- Fixed wrong dates in the changelog + +* Sat Jul 27 2013 Petr Machata - 1.00.1-6 - Rebuild for boost 1.54.0 * Sun Jun 02 2013 Denis Arnaud - 1.00.1-5 @@ -185,7 +193,7 @@ rm -rf $RPM_BUILD_ROOT * Sat Nov 05 2011 Denis Arnaud 0.44.1-1 - Upstream update -* Tue Nov 02 2011 Denis Arnaud 0.44.0-1 +* Wed Nov 02 2011 Denis Arnaud 0.44.0-1 - Upstream update * Tue Oct 18 2011 Denis Arnaud 0.43.1-1 @@ -292,7 +300,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jan 18 2011 Denis Arnaud 0.11.0-1 - Upstream update -* Thu Dec 29 2010 Son Nguyen Kim 0.10.0-1 +* Wed Dec 29 2010 Son Nguyen Kim 0.10.0-1 - Upstream update * Fri Dec 03 2010 Son Nguyen Kim 0.9.0-1 @@ -316,6 +324,6 @@ rm -rf $RPM_BUILD_ROOT * Sun Aug 29 2010 Son Nguyen Kim 0.3.0-1 - Upstream update -* Wed Jul 13 2010 Son Nguyen Kim 0.1.0-1 +* Tue Jul 13 2010 Son Nguyen Kim 0.1.0-1 - First RPM release