X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dmraid.spec;h=b63189725bf789e548df53e2e3fc769ef116e572;hb=add5855c10ef54baf7d40f41d0fe095a3ae454a2;hp=b2d6a1d8d42f02dae2352804d6ee945862e5cc15;hpb=2473f4211ef90a8817ac3e826bd81b9c3ace9d4e;p=packages%2Fdmraid.git

diff --git a/dmraid.spec b/dmraid.spec
index b2d6a1d..b631897 100644
--- a/dmraid.spec
+++ b/dmraid.spec
@@ -1,53 +1,92 @@
 #
 # Conditional build:
 %bcond_without	initrd	# without initrd version
+%bcond_without	selinux	# build without SELinux support (needs selinux-disabled device-mapper)
 #
 Summary:	Device-mapper RAID tool
-Summary(pl):	Narzêdzie do RAID-u opartego o device-mapper
+Summary(pl.UTF-8):	Narzędzie do RAID-u opartego o device-mapper
 Name:		dmraid
 Version:	1.0.0
-%define	_rc rc10
-%define	_rel 1
-Release:	0.%{_rc}.%{_rel}
+%define	_rc	rc15
+Release:	0.%{_rc}.1
 License:	GPL
 Group:		Base
 Source0:	http://people.redhat.com/~heinzm/sw/dmraid/src/%{name}-%{version}.%{_rc}.tar.bz2
-# Source0-md5:	0206f8166bfdc370c4ee8efcb35af111
+# Source0-md5:	2602887205a35f89b59eeba3a868150f
 Patch0:		%{name}-selinux-static.patch
+Patch1:		%{name}-fix.patch
+Patch2:		%{name}-optflags.patch
+Patch3:		%{name}-as-needed.patch
 URL:		http://people.redhat.com/~heinzm/sw/dmraid/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	device-mapper-devel >= 1.01.01
-%{?with_initrd:BuildRequires:	device-mapper-static}
-%{?with_initrd:BuildRequires:	glibc-static}
-%{?with_initrd:BuildRequires:	libselinux-static}
-%{?with_initrd:BuildRequires:	libsepol-static}
+BuildRequires:	device-mapper-devel >= 1.02.02
+BuildRequires:	zlib-devel
+%if %{with initrd}
+BuildRequires:	device-mapper-static >= 1.02.05-0.4
+BuildRequires:	glibc-static
+%{?with_selinux:BuildRequires:	libselinux-static}
+%{?with_selinux:BuildRequires:	libsepol-static}
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 DMRAID supports device discovery, set activation and display of
 properties for ATARAID on Linux >= 2.4 using device-mapper.
 
-%description -l pl
-DMRAID obs³uguje wykrywanie urz±dzeñ, ustawianie aktywacji i
-wy¶wietlanie w³a¶ciwo¶ci ATARAID-u na Linuksie >= 2.4 przy u¿yciu
+%description -l pl.UTF-8
+DMRAID obsługuje wykrywanie urządzeń, ustawianie aktywacji i
+wyświetlanie właściwości ATARAID-u na Linuksie >= 2.4 przy użyciu
 device-mappera.
 
+%package devel
+Summary:	Header files for dmraid library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki dmraid
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+dmraid-devel provides a library interface for RAID device discovery,
+RAID set activation and display of properties for ATARAID volumes.
+
+%description devel -l pl.UTF-8
+Ten pakiet udostępnia interfejs biblioteczny do wykrywania urządzeń
+RAID, włączania zestawu RAID i wyświetlania właściwości wolumenów
+ATARAID.
+
+%package static
+Summary:	Static library for dmraid
+Summary(pl.UTF-8):	Statyczna biblioteka dmraid
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+dmraid-static provides a library interface for RAID device discovery,
+RAID set activation and display of properties for ATARAID volumes.
+
+%description static -l pl.UTF-8
+Ten pakiet udostępnia statyczną bibliotekę do wykrywania urządzeń
+RAID, włączania zestawu RAID i wyświetlania właściwości wolumenów
+ATARAID.
+
 %package initrd
 Summary:	Device-mapper RAID tool - statically linked version
-Summary(pl):	Narzêdzie do RAID-u opartego o device-mapper - wersja statyczna
+Summary(pl.UTF-8):	Narzędzie do RAID-u opartego o device-mapper - wersja statyczna
 Group:		Base
 
 %description initrd
 Statically linked version of dmraid utility.
 
-%description initrd -l pl
-Statycznie skonsolidowana wersja programu narzêdziowego dmraid.
+%description initrd -l pl.UTF-8
+Statycznie skonsolidowana wersja programu narzędziowego dmraid.
 
 %prep
 %setup -q -n %{name}
 mv */* ./
-%patch0 -p2
+%{?with_selinux:%patch0 -p2}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub autoconf
@@ -57,36 +96,52 @@ cp -f /usr/share/automake/config.sub autoconf
 %if %{with initrd}
 %configure \
 	--enable-static_link
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+%{__make} -j1
 cp -f tools/dmraid{,-initrd}
 %{__make} clean
 %endif
 
-%configure
-%{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+%configure \
+	--enable-shared_lib
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D tools/dmraid $RPM_BUILD_ROOT%{_sbindir}/dmraid
-%{?with_initrd:install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd}
-install -D man/dmraid.8 $RPM_BUILD_ROOT%{_mandir}/man8/dmraid.8
+%{__make} install \
+	includedir=$RPM_BUILD_ROOT%{_includedir} \
+	libdir=$RPM_BUILD_ROOT%{_libdir} \
+	mandir=$RPM_BUILD_ROOT%{_mandir} \
+	sbindir=$RPM_BUILD_ROOT%{_sbindir}
+
+%if %{with initrd}
+install -D tools/dmraid-initrd $RPM_BUILD_ROOT/sbin/dmraid-initrd
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc README TODO doc/dmraid_design.txt
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/dmraid
+%attr(755,root,root) %{_libdir}/libdmraid.so.*.*.*
 %{_mandir}/man8/*
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdmraid.so
+%{_includedir}/dmraid
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libdmraid.a
+
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%attr(755,root,root) /sbin/dmraid-initrd
 %endif