Various spec and patch fixes

This commit is contained in:
Ignacio Vazquez-Abrams 2005-03-24 12:24:11 +00:00
parent 11a794fb14
commit 7dcb7eaa52
2 changed files with 13 additions and 13 deletions

View File

@ -9,12 +9,3 @@
TCL_BIN_DIR = @TCL_BIN_DIR@
TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
TCL_LIB_FILE = @TCL_LIB_FILE@
@@ -195,7 +195,7 @@
program_transform_name = @program_transform_name@
pyexecdir = @pyexecdir@
-pythondir = $(prefix)/lib/python
+pythondir = $(libdir)/python2.3
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@

View File

@ -2,7 +2,7 @@
Name: hamlib
Version: 1.2.3
Release: 8
Release: 9
License: LGPL
Group: System Environment/Libraries
Summary: Run-time library to control radio transceivers and receivers
@ -97,6 +97,8 @@ popd
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
/sbin/ldconfig -N -n $RPM_BUILDROOT%{_libdir}
pushd bindings
# Install Python
make prefix=$RPM_BUILD_ROOT%{_prefix} \
@ -145,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc COPYING doc/html
%doc COPYING.LIB doc/html
%{_bindir}/rigctl
%{_bindir}/rigmem
%{_bindir}/rigswr
@ -155,7 +157,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libhamlib-%{version}.so.2.0.2
%{_libdir}/hamlib-*.so
%{_libdir}/libhamlib.la
%{_libdir}/hamlib-*.la
%{_mandir}/man8/rpc.rigd.8.gz
%{_mandir}/man8/rpc.rotd.8.gz
%{_mandir}/man1/rigctl.1.gz
@ -190,10 +191,11 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-, root, root)
%doc README.developer
%{_libdir}/libhamlib.so
%{_libdir}/libhamlib.a
%{_libdir}/hamlib-*.a
%{_datadir}/aclocal/hamlib.m4
%dir %{_includedir}/hamlib
%{_includedir}/hamlib/rig.h
%{_includedir}/hamlib/riglist.h
%{_includedir}/hamlib/rig_dll.h
@ -203,6 +205,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.3-9
- Python binding cleanup
- soname/ldconfig cleanup
- Added %%{_includedir}/hamlib to -devel
- Removed %%{_libdir}/hamlib-*.a and hamlib-*.la
- %%doc cleanups
* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.3-8
- Added -q to %%setup
- Fixed Python binding build and Requires