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

Brought to you by: carobelin, clacombe, denis_arnaud, dkchoe, and 7 others

stdair-svn

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

From: <den...@us...> - 2010-08-21 20:10:21

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.

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

From: <den...@us...> - 2010-08-28 21:14:26

Revision: 282
          http://stdair.svn.sourceforge.net/stdair/?rev=282&view=rev
Author:   denis_arnaud
Date:     2010-08-28 21:14:19 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
[Packaging] Took into account the feedback from review (https://bugzilla.redhat.com/show_bug.cgi?id=614036).

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

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-08-28 20:39:17 UTC (rev 281)
+++ trunk/stdair/stdair.spec	2010-08-28 21:14:19 UTC (rev 282)
@@ -14,6 +14,7 @@
 %{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)}
 
 BuildRequires:  boost-devel
+BuildRequires:  soci-mysql-devel
 BuildRequires:  cppunit-devel
 
 
@@ -31,8 +32,6 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
-Requires(post): info
-Requires(preun): info
 
 %description    devel
 This package contains the header files, static libraries and
@@ -56,7 +55,6 @@
 
 %prep
 %setup -q
-# find ./doc -type f -perm 755 -exec chmod 644 {} \;
 # Fix some permissions and formats
 rm -f INSTALL
 chmod -x AUTHORS ChangeLog COPYING NEWS README
@@ -73,10 +71,9 @@
 %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
 rm -f $RPM_BUILD_ROOT%{_libdir}/libextracppunit.la
-rm -rf %{mydocs} && mkdir -p %{mydocs}
+mkdir -p %{mydocs}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
 
 %clean
@@ -92,7 +89,7 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/%{name}
 %{_libdir}/lib*.so.*
-%{_mandir}/man3/%{name}.3.*
+%{_mandir}/man1/%{name}.1.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -104,11 +101,12 @@
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/aclocal/%{name}.m4
 %{_mandir}/man1/%{name}-config.1.*
+%{_mandir}/man3/%{name}.3.*
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{mydocs}/html
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc COPYING
 
 
 %changelog
@@ -117,4 +115,3 @@
 
 * Wed Jul 13 2010 Son Nguyen Kim <ngu...@gm...> 0.1.0-1
 - First RPM release
-


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

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

From: <den...@us...> - 2010-08-28 22:07:05

Revision: 294
          http://stdair.svn.sourceforge.net/stdair/?rev=294&view=rev
Author:   denis_arnaud
Date:     2010-08-28 22:06:59 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
[Packaging] Fixed RPM packaging issues.

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

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-08-28 22:05:52 UTC (rev 293)
+++ trunk/stdair/stdair.spec	2010-08-28 22:06:59 UTC (rev 294)
@@ -101,7 +101,7 @@
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/aclocal/%{name}.m4
 %{_mandir}/man1/%{name}-config.1.*
-%{_mandir}/man3/%{name}.3.*
+%{_mandir}/man3/%{name}-library.3.*
 
 %files doc
 %defattr(-,root,root,-)
@@ -118,3 +118,4 @@
 
 * Wed Jul 13 2010 Son Nguyen Kim <ngu...@gm...> 0.1.0-1
 - First RPM release
+


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

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

From: <den...@us...> - 2010-08-29 20:05:24

Revision: 296
          http://stdair.svn.sourceforge.net/stdair/?rev=296&view=rev
Author:   denis_arnaud
Date:     2010-08-29 20:05:18 +0000 (Sun, 29 Aug 2010)

Log Message:
-----------
[Packaging] Took into account the feedback from the package review (https://bugzilla.redhat.com/show_bug.cgi?id=614036).

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

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-08-29 20:04:40 UTC (rev 295)
+++ trunk/stdair/stdair.spec	2010-08-29 20:05:18 UTC (rev 296)
@@ -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
 


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

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

From: <den...@us...> - 2010-08-29 20:54:40

Revision: 299
          http://stdair.svn.sourceforge.net/stdair/?rev=299&view=rev
Author:   denis_arnaud
Date:     2010-08-29 20:54:34 +0000 (Sun, 29 Aug 2010)

Log Message:
-----------
[Packaging] Took into account the feedback from the package review (https://bugzilla.redhat.com/show_bug.cgi?id=614036).

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

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-08-29 20:54:05 UTC (rev 298)
+++ trunk/stdair/stdair.spec	2010-08-29 20:54:34 UTC (rev 299)
@@ -102,9 +102,11 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
+# When the extracc package will be approved, the following line has to be removed
 %{_includedir}/extracppunit
 %{_bindir}/%{name}-config
 %{_libdir}/lib%{name}.so
+# When the extracc package will be approved, the following line has to be removed
 %{_libdir}/libextracppunit.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/aclocal/%{name}.m4


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

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

From: <cla...@us...> - 2010-09-03 14:50:41

Revision: 305
          http://stdair.svn.sourceforge.net/stdair/?rev=305&view=rev
Author:   clacombe
Date:     2010-09-03 14:50:35 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
[Packaging] Replace extracc external ref to dependency

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

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-09-03 14:00:18 UTC (rev 304)
+++ trunk/stdair/stdair.spec	2010-09-03 14:50:35 UTC (rev 305)
@@ -123,6 +123,9 @@
 * Sun Aug 30 2010 Son Nguyen Kim <ngu...@gm...> 99.99.99-1
 - Upstream update
 
+* Fri Sep 03 2010 Son Nguyen Kim <ngu...@gm...> 0.4.0-1
+- Replace extracc external ref to dependency
+
 * 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.

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

From: <cla...@us...> - 2010-09-06 13:50:33

Revision: 310
          http://stdair.svn.sourceforge.net/stdair/?rev=310&view=rev
Author:   clacombe
Date:     2010-09-06 13:50:26 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
[Packaging] Replace extracc external ref to dependency

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

Modified: trunk/stdair/stdair.spec
===================================================================
--- trunk/stdair/stdair.spec	2010-09-06 13:46:07 UTC (rev 309)
+++ trunk/stdair/stdair.spec	2010-09-06 13:50:26 UTC (rev 310)
@@ -15,10 +15,7 @@
 
 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
+BuildRequires:  extracc-devel
 
 
 %description
@@ -76,8 +73,6 @@
 
 # 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}
@@ -102,12 +97,8 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
-# When the extracc package will be approved, the following line has to be removed
-%{_includedir}/extracppunit
 %{_bindir}/%{name}-config
 %{_libdir}/lib%{name}.so
-# When the extracc package will be approved, the following line has to be removed
-%{_libdir}/libextracppunit.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/aclocal/%{name}.m4
 %{_mandir}/man1/%{name}-config.1.*


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