- don't build and use included installwatch.so

- requires (not buildrequires) installwatch
- release 2

Changed files:
    checkinstall.spec -> 1.6

diff --git a/checkinstall.spec b/checkinstall.spec
index af34bb3f216fd97b08c16c71d5584c0e80187d88..03c35d864fa160ef0b7189a49c6e188f83e7ef7f 100644 (file)
--- a/checkinstall.spec
+++ b/checkinstall.spec
@@ -1,12 +1,12 @@
-%define                iw_version      0.6.3
 Summary:       CheckInstall installations tracker
 Summary(pl):   Proste narzêdzie do tworzenia i zarzadzania pakietami (.tgz, .rpm, .deb)
 Name:          checkinstall
 Version:       1.5.1
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development
 Requires:      bash
+Requires:      installwatch >= 0.6.3
 Source0:       http://asic-linux.com.mx/~izto/%{name}-%{version}.tgz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,26 +26,15 @@ narz
 %prep
 %setup -q 
 
-%build
-%{__make} CC="gcc %{rpmcflags} -Wall"
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT%{_prefix}/{bin,sbin,lib/checkinstall} -p
 
-sed -e "s|#PREFIX#|%{_prefix}|" < installwatch-%{iw_version}/installwatch > installwatch
-
-sed -e "s|INSTALLWATCH_PREFIX=\"/usr/local\"|INSTALLWATCH_PREFIX=\"%{_prefix}\"|" \
-       < checkinstallrc > foo
-mv foo checkinstallrc
-
 sed -e "s|#\!/bin/sh|#\!/bin/bash|" < checkinstall > foo
 sed -e "s|/usr/local|%{_prefix}|" < foo > checkinstall
 
 install {checkinstall,makepak} $RPM_BUILD_ROOT%{_sbindir}
 install checkinstallrc         $RPM_BUILD_ROOT%{_libdir}/checkinstall
-install installwatch $RPM_BUILD_ROOT%{_bindir}
-install installwatch-%{iw_version}/installwatch.so $RPM_BUILD_ROOT%{_libdir}
 gzip -9nfr doc-pak/* 
 
 %clean
@@ -54,8 +43,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc doc-pak
-%attr(755,root,root) %{_bindir}/installwatch
 %attr(755,root,root) %{_sbindir}/checkinstall
 %attr(755,root,root) %{_sbindir}/makepak
 %config %{_libdir}/checkinstall/checkinstallrc
-%{_libdir}/installwatch.so