packages: lxc/lxc.spec - up to 0.6.5, now FHS compliant - removed empty -st...

[zbyniu]

Author: zbyniu                       Date: Tue Mar 23 09:48:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.6.5, now FHS compliant
- removed empty -static package, -ldflags.patch not needed

---- Files affected:
packages/lxc:
   lxc.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/lxc/lxc.spec
diff -u packages/lxc/lxc.spec:1.4 packages/lxc/lxc.spec:1.5
--- packages/lxc/lxc.spec:1.4	Sun May  3 23:15:46 2009
+++ packages/lxc/lxc.spec	Tue Mar 23 10:47:54 2010
@@ -1,20 +1,22 @@
 # $Revision$, $Date$
-# TODO: FHS (/var/lxc -> /var/lib/lxc)
 Summary:	Linux Container Tools
 Name:		lxc
-Version:	0.6.2
+Version:	0.6.5
 Release:	1
 License:	GPL
 Group:		Base
 Source0:	http://dl.sourceforge.net/lxc/%{name}-%{version}.tar.gz
-# Source0-md5:	eb4e14c2d58663f5ebcd6cd3d6a61fe6
-Patch0:		%{name}-ldflags.patch
+# Source0-md5:	d648bcf82541c0da6725da502ee1d111
 URL:		http://sourceforge.net/projects/lxc
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	docbook-dtd30-sgml
+BuildRequires:	docbook-utils
 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,
@@ -33,35 +35,31 @@
 %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
-%patch0 -p1
-sed -i -e 's#^lxcpath=.*#lxcpath=/var/lxc#g' src/lxc/Makefile.am
 
 %build
 %{__libtoolize}
 %{__aclocal} -I config
 %{__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
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
-install -d $RPM_BUILD_ROOT/var/lxc
+install -d $RPM_BUILD_ROOT%{configpath}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,25 +69,19 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README etc/*.conf etc/*-config
-%dir %{_sysconfdir}/lxc
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lxc/*
+%doc AUTHORS ChangeLog README doc/examples/*.conf
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/liblxc-*.so
-%{_mandir}/*/**
-%dir %{_sysconfdir}/lxc
-%dir /var/lxc
+%attr(755,root,root) %{_libdir}/liblxc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblxc.so.0
+%{_mandir}/man?/lxc*
+%dir %{configpath}
 %attr(755,root,root) %{_libdir}/lxc-init
 
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -97,6 +89,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/03/23 09:47:54  zbyniu
+- up to 0.6.5, now FHS compliant
+- removed empty -static package, -ldflags.patch not needed
+
 Revision 1.4  2009/05/03 21:15:46  aredridel
 - 0.6.2
 
@@ -108,4 +104,3 @@
 
 Revision 1.1  2008/11/28 18:15:57  arekm
 - initial
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxc/lxc.spec?r1=1.4&r2=1.5&f=u