Changeset 1720 for trunk

Timestamp:

28/10/11 00:24:41 (7 months ago)

Author:

Freddie Akeroyd

Message:

put java .so into java package refs #295

Location:

trunk

Files:

• build_rpm.in (modified) (1 diff)
• nexus_spec.in (modified) (6 diffs)

trunk/build_rpm.in

@@ -34 +34 @@
 fi
 # buildroot is actually where we install to
-env NEXUS_CONFIG_OPTIONS="$build_args" rpmbuild -ba --buildroot $nxtop/installroot nexus.spec --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5"
+env NEXUS_CONFIG_OPTIONS="$build_args" rpmbuild -ba --buildroot $nxtop/installroot --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" nexus.spec

trunk/nexus_spec.in

@@ -104 +104 @@
 %doc README NEWS ChangeLog AUTHORS COPYING INSTALL
 # %docdir /usr/local/doc
-%{_libdir}/*.so*
+%{_libdir}/libNeXus*.so*
+%{_libdir}/libnxconvert*.so*
 #%ifarch x86_64
 #/usr/lib/*.so*
@@ -111 +112 @@
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
+%{_libdir}/libNeXus*.a
+%{_libdir}/libnxconvert*.a
 %{_libdir}/pkgconfig
 %{_includedir}/*
@@ -118 +120 @@
 %defattr(-,root,root)
 %{_bindir}/*
+%{_datadir}/man
 
 %files doc
 %defattr(-,root,root)
-%{_datadir}/man
 %{_datadir}/nexus
 
@@ -131 +133 @@
 %defattr(-,root,root)
 %{_datadir}/java
+%{_libdir}/libjnexus.so*
+%{_libdir}/libjnexus.a
 
 %clean
@@ -136 +140 @@
 
 %post
+if test `whoami` = root; then ldconfig; fi
+
+%post tools
 if [ "$RPM_INSTALL_PREFIX" != "" ]; then
     INSTALL_PREFIX=$RPM_INSTALL_PREFIX
@@ -142 +149 @@
 fi
 
-%post tools
 ( cd $INSTALL_PREFIX/bin; for i in nxbuild; do \
   sed -i -e "s|^prefix=.*|prefix=$INSTALL_PREFIX|" $i; done )
-if test `whoami` = root; then ldconfig; fi
 
 %postun