Up to 0.9.0

[packages/lxc.git] / lxc.spec

diff --git a/lxc.spec b/lxc.spec
index 1a13024475635ce1128273a8c7c07c8dacf5fc0a..9e7a424f0a88fba799a662c55f86d0cf5fd18f8f 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -1,18 +1,21 @@
-# TODO: FHS (/var/lxc -> /var/lib/lxc)
 Summary:       Linux Container Tools
 Name:          lxc
-Version:       0.4.0
+Version:       0.9.0
 Release:       1
 License:       GPL
 Group:         Base
-Source0:       http://dl.sourceforge.net/lxc/%{name}-%{version}.tar.gz
-# Source0-md5: 327f0e700858ab5b916aa36517680256
-URL:           http://sourceforge.net/projects/lxc
-BuildRequires: autoconf
-BuildRequires: automake
+Source0:       http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz
+# Source0-md5: 8552a4479090616f4bc04d8473765fc9
+Patch0:                %{name}-devpts.patch
+URL:           http://lxc.sourceforge.net
+BuildRequires: docbook-dtd30-sgml
+BuildRequires: docbook-utils
+BuildRequires: libcap-devel
 BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                configpath      /var/lib/lxc
+
 %description
 Tools to create and manage containers. It contains a full featured
 container with the isolation / virtualization of the pids, the ipc,
@@ -31,34 +34,30 @@ Requires:   %{name} = %{epoch}:%{version}-%{release}
 %description devel
 lxc development files.
 
-%package static
-Summary:       Static lxc library
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-
-%description static
-Static lxc library.
-
 %prep
-%setup -q
-sed -i -e 's#^lxcpath=.*#lxcpath=/var/lxc#g' src/lxc/Makefile.am
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure
+%configure \
+       --with-config-path=%{configpath}
 
 %{__make}
+%{__make} -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       pcdatadir=%{_pkgconfigdir}
+
+%{__make} -C doc install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/var/lxc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
+
+install -d $RPM_BUILD_ROOT%{configpath}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,18 +67,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README etc/*.conf etc/*-config
+%doc AUTHORS ChangeLog CONTRIBUTING MAINTAINERS README TODO doc/FAQ.txt doc/examples/*.conf
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/liblxc-*.so
+%attr(755,root,root) %{_libdir}/liblxc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblxc.so.0
+%{_libdir}/lxc/rootfs/README
+%dir %{configpath}
+%dir %{_libdir}/lxc
+%dir %{_libdir}/lxc/rootfs
+%attr(755,root,root) %{_libdir}/lxc/lxc-init
 %dir %{_sysconfdir}/lxc
-%dir /var/lxc
+%config(noreplace) %{_sysconfdir}/lxc/default.conf
+%{_datadir}/lxc
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/lxc
 %attr(755,root,root) %{_libdir}/liblxc.so
-%{_libdir}/lib*.la
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_pkgconfigdir}/lxc.pc