Changeset 1721


Ignore:
Timestamp:
28/10/11 00:33:45 (7 months ago)
Author:
Freddie Akeroyd
Message:

put java .so into java package refs #295

Location:
branches/4.2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/4.2/build_rpm.in

    r1717 r1721  
    2323mkdir $nxtop/installroot 
    2424#  
     25make dist 
    2526ln -sf $nxtop/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.gz $topdir/SOURCES 
    2627cp $nxtop/nexus.spec $topdir/SPECS 
    2728cd $topdir/SPECS 
     29# 
     30if test -z "$1"; then 
     31    build_args="--with-python --with-java-home=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/ --with-doxygen" 
     32else 
     33    build_args="$1" 
     34fi 
    2835# buildroot is actually where we install to 
    29 env NEXUS_CONFIG_OPTIONS="$1" rpmbuild -ba --buildroot $nxtop/installroot nexus.spec --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" 
     36env NEXUS_CONFIG_OPTIONS="$build_args" rpmbuild -ba --buildroot $nxtop/installroot --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" nexus.spec 

  • branches/4.2/nexus_spec.in

    r1427 r1721  
    22# $Id$ 
    33# Template for NeXus RPM SPEC file 
    4 # Copyright (C) 2004 Freddie Akeroyd 
     4# Copyright (C) 2004 Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk> 
    55# 
    66Summary: Libraries and utilities for using NeXus format data files 
    … …  
    3737access routines, documentation, examples and a basic NeXus file browser. 
    3838 
    39 #%package devel 
    40 #Summary: Libraries and utilities for using NeXus format data files 
    41 #Group: Development/Libraries 
    42 # 
    43 #%description devel 
    44 #NeXus is an international standard for exchanging data files 
    45 #among Neutron, Muon and X-ray science facilities. The underlying 
    46 #data is stored using the HDF format from NCSA. This package provides 
     39%package devel 
     40Summary: Libraries and utilities for using NeXus format data files 
     41Group: Development/Libraries 
     42 
     43%description devel 
     44NeXus is an international standard for exchanging data files 
     45among Neutron, Muon and X-ray science facilities. The underlying 
     46data is stored using the HDF format from NCSA. This package provides 
     47 
     48%package tools 
     49Summary: Libraries and utilities for using NeXus format data files 
     50Group: Development/Libraries 
     51 
     52%description tools 
     53NeXus is an international standard for exchanging data files 
     54among Neutron, Muon and X-ray science facilities. The underlying 
     55data is stored using the HDF format from NCSA. This package provides 
     56 
     57%package doc 
     58Summary: Libraries and utilities for using NeXus format data files 
     59Group: Development/Libraries 
     60 
     61%description doc 
     62NeXus is an international standard for exchanging data files 
     63among Neutron, Muon and X-ray science facilities. The underlying 
     64data is stored using the HDF format from NCSA. This package provides 
     65 
     66%package python 
     67Summary: Libraries and utilities for using NeXus format data files 
     68Group: Development/Libraries 
     69 
     70%description python 
     71NeXus is an international standard for exchanging data files 
     72among Neutron, Muon and X-ray science facilities. The underlying 
     73data is stored using the HDF format from NCSA. This package provides 
     74 
     75%package java 
     76Summary: Libraries and utilities for using NeXus format data files 
     77Group: Development/Libraries 
     78 
     79%description java 
     80NeXus is an international standard for exchanging data files 
     81among Neutron, Muon and X-ray science facilities. The underlying 
     82data is stored using the HDF format from NCSA. This package provides 
    4783 
    4884%prep 
    … …  
    6298if test "$RPM_BUILD_ROOT" != "/"; then rm -fr "$RPM_BUILD_ROOT"; fi 
    6399make DESTDIR="$RPM_BUILD_ROOT" install 
     100find "$RPM_BUILD_ROOT" -name '*.la' -exec rm -f {} \; 
    64101 
    65102%files 
    … …  
    67104%doc README NEWS ChangeLog AUTHORS COPYING INSTALL 
    68105# %docdir /usr/local/doc 
    69 %{_libdir}/* 
     106%{_libdir}/libNeXus*.so* 
     107#%ifarch x86_64 
     108#/usr/lib/*.so* 
     109#%endif 
     110 
     111%files devel 
     112%defattr(-,root,root) 
     113%{_libdir}/libNeXus*.a 
     114%{_libdir}/pkgconfig 
     115%{_includedir}/* 
     116 
     117%files tools 
     118%defattr(-,root,root) 
    70119%{_bindir}/* 
    71 %{_datadir}/* 
    72 %{_includedir}/* 
     120 
     121%files doc 
     122%defattr(-,root,root) 
     123%{_datadir}/nexus 
     124 
     125%files python 
     126%defattr(-,root,root) 
    73127/usr/lib/python*/site-packages/nxs 
    74 #%files devel 
    75 #%{_libdir}/*.a 
    76 #%{_libdir}/*.so* 
     128 
     129%files java 
     130%defattr(-,root,root) 
     131%{_datadir}/java 
     132%{_libdir}/libjnexus.so* 
     133%{_libdir}/libjnexus.a 
    77134 
    78135%clean 
    … …  
    80137 
    81138%post 
     139if test `whoami` = root; then ldconfig; fi 
     140 
     141%post tools 
    82142if [ "$RPM_INSTALL_PREFIX" != "" ]; then 
    83143    INSTALL_PREFIX=$RPM_INSTALL_PREFIX 
    … …  
    85145    INSTALL_PREFIX=%{_prefix} 
    86146fi 
     147 
    87148( cd $INSTALL_PREFIX/bin; for i in nxbuild; do \ 
    88149  sed -i -e "s|^prefix=.*|prefix=$INSTALL_PREFIX|" $i; done ) 
    89 if test `whoami` = root; then ldconfig; fi 
    90150 
    91151%postun 
    … …  
    95155# first line should be   date  user  email 
    96156%changelog 
     157* Sat Oct 22 2011 Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk> - 4.3.0 
     158- Split into subpackages 
    97159* Thu May 24 2007 Freddie Akeroyd <F.A.Akeroyd@rl.ac.uk> - 4.0.0 
    98160- Tag and build 4.0.0 
Note: See TracChangeset for help on using the changeset viewer.