diff --git a/.gitignore b/.gitignore index bc883f3..622699a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ hbaapi_src_2.2.tgz hbaapi_build_2.2.2.tar.gz +/hbaapi_build_2.2.4.tar.gz diff --git a/libhbaapi.spec b/libhbaapi.spec index 11104e1..32c88a1 100644 --- a/libhbaapi.spec +++ b/libhbaapi.spec @@ -1,10 +1,9 @@ -%define buildversion 2.2.2 +%define buildversion 2.2.4 Name: libhbaapi Version: 2.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: SNIA HBAAPI library - Group: System Environment/Libraries License: SNIA URL: http://sourceforge.net/projects/hbaapi/ @@ -15,11 +14,8 @@ Source0: http://downloads.sourceforge.net/hbaapi/hbaapi_src_%{version}.tg # git archive v%{buildversion} > ../hbaapi_build.tar # cd .. && gzip hbaapi_build.tar Source1: hbaapi_build_%{buildversion}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: libhbaapi-2.2-9-dl-linking.patch - BuildRequires: automake libtool -# Requires: %description The SNIA HBA API library. C-level project to manage @@ -35,48 +31,39 @@ Requires: pkgconfig The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep %setup -q -n hbaapi_src_2.2 %setup -q -T -D -a 1 -n hbaapi_src_2.2 %patch0 -p1 -b .ld-linking - %build ./bootstrap.sh %configure --disable-static make %{?_smp_mflags} - %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - - -%clean -rm -rf $RPM_BUILD_ROOT - +make install DESTDIR=%{buildroot} +find %{buildroot} -name '*.la' -exec rm -f {} ';' %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%defattr(-,root,root,-) %doc readme.txt %config(noreplace) %{_sysconfdir}/hba.conf %{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc - %changelog +* Thu Jul 07 2011 Petr Sabata - 2.2-12 +- Update to hbaapi_build 2.2.4 +- Remove now obsolete Buildroot and defattr + * Tue Feb 08 2011 Fedora Release Engineering - 2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 8a9fcdd..27443ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5c9281e28f8731e38721b34494a75eef hbaapi_src_2.2.tgz -b6df718265767f62086067faaf1f9710 hbaapi_build_2.2.2.tar.gz +8107830a97da2ce99c3ba9987ddb0d14 hbaapi_build_2.2.4.tar.gz