Changeset 7009

Timestamp:

04/04/08 13:58:36 (5 years ago)

Author:

bhilburn

Message:

forgot to split into package section

Files:

• experimental/installation/specs/working/ossie_cf.spec (modified) (6 diffs)

experimental/installation/specs/working/ossie_cf.spec

@@ -23 +23 @@
 Group: Radio
 URL: http://ossie.wireless.vt.edu
-Provides ossiecf
 
 # Package prereqs
@@ -34 +33 @@
 # Package source instructions
 Source:%{_name}-%{_version}-%{_release}.tar.gz
-Buildroot: %{_tmppath}/%{_name}-%{_version}-%{_release}-%(%{__id_u} -n)
+Buildroot: %{_tmppath}/%{_name}-%{_version}-%{_release}
 
 %description
@@ -50 +49 @@
 Interfaces, Node Booter, the domain, default node, and GPP Device.
 
-# Let rpmbuild auto-handle the prep steps
+%package %{_name}
+Summary: OSSIE Core Framework
+Group: Radio
+Provides: ossiecf = %{_version} %{_name} = %{_version}-%{_release}
+Obsoletes: %{_name}
+
+%description  %{_name}
+OSSIE core framework.  It is required for all OSSIE installs.
+See http://ossie.wireless.vt.edu/ for more information
+
+# Let rpmbuild auto-handle the prep steps, the -q option
+# makes the unpack quiet
 %prep
 %setup -q
@@ -58 +68 @@
 ./reconf
 ./configure
-make
+%{?make:%make}%{!?make:make} all
+#make
 
 # Install the binaries / libraries / etc
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+#make install DESTDIR=$RPM_BUILD_ROOT
+%{?makeinstall_std:%makeinstall_std}%{!?makeinstall_std:make DESTDIR=%{buildroot} install}
 
 # Clean up after ourselves so that we don't bloat /usr/src
 %clean
-rm -rf $RPM_BUILD_ROOT
+[ -z %{buildroot} ] || rm -rf %{buildroot}
+#rm -rf $RPM_BUILD_ROOT
 
 # Update system library directories
@@ -74 +87 @@
 %files
 %defattr(-,root,root,-)
+# OSSIE libraries
 %{_libdir}/*.a
 %{_libdir}/*.la
@@ -80 +94 @@
 %{_libdir}/*.so.0.0.4
 %{_libdir}/pkgconfig/ossie.pc
+
+# OSSIE include headers
 %{_includedir}/ossie/*.h
+
+# OSSIE XML dtd files
 /sdr/xml/dtd/*.dtd