From c15e40b91567f2a4495b10ad2d7a020db5a02c9b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Aug 20 2009 05:30:15 +0000 Subject: Adjust build process to use bti's new configure system --- diff --git a/bti.spec b/bti.spec index 5b98818..d7795a6 100644 --- a/bti.spec +++ b/bti.spec @@ -10,7 +10,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/people/gregkh/bti/bti-%{v BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # still supporting EL-5, rename to libcurl-devel once this changes -BuildRequires: curl-devel readline-devel libxml2-devel +BuildRequires: curl-devel readline-devel libxml2-devel pcre-devel #Requires: %description @@ -23,14 +23,13 @@ and fast manner to annoy the whole world. %build -CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 -cp -p bti $RPM_BUILD_ROOT%{_bindir}/ -cp -p bti.1 $RPM_BUILD_ROOT%{_mandir}/man1/ +make install DESTDIR=$RPM_BUILD_ROOT # bash completion mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d cp -p bti-bashcompletion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/bti @@ -42,11 +41,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc bti.example ChangeLog COPYING HACKING README RELEASE-NOTES +%doc bti.example ChangeLog COPYING README RELEASE-NOTES # Own the directory so that we do not need to Require: # bash-completion just for one file -%config %{_sysconfdir}/bash_completion.d +%dir %{_sysconfdir}/bash_completion.d +%config(noreplace) %{_sysconfdir}/bash_completion.d/bti %{_bindir}/bti +%{_bindir}/bti-shrink-urls %{_mandir}/man1/*