|
@@ -1,14 +1,14 @@
|
|
-%define gitdate 20120525
|
|
+#define gitdate 20120525
|
|
Name: lxc
|
|
Name: lxc
|
|
Version: 0.8.0
|
|
Version: 0.8.0
|
|
-Release: 1.%{gitdate}%{?_dist_release}
|
|
+Release: 2%{?_dist_release}
|
|
Summary: Linux Resource Containers
|
|
Summary: Linux Resource Containers
|
|
Summary(ja): Linux リソースコンテナ
|
|
Summary(ja): Linux リソースコンテナ
|
|
|
|
|
|
Group: Applications/System
|
|
Group: Applications/System
|
|
License: LGPLv2+
|
|
License: LGPLv2+
|
|
URL: http://lxc.sourceforge.net
|
|
URL: http://lxc.sourceforge.net
|
|
-Source0: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}-%{gitdate}.tar.xz
|
|
+Source0: http://lxc.sourceforge.net/download/lxc/%{name}-%{version}.tar.gz
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
@@ -75,11 +75,11 @@ Requires: %{name} = %{version}-%{release}
|
|
This package contains documentation for %{name}.
|
|
This package contains documentation for %{name}.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
-%setup -q -n %{name}-%{version}-%{gitdate}
|
|
+%setup -q -n %{name}-%{version}
|
|
|
|
|
|
%build
|
|
%build
|
|
./autogen.sh
|
|
./autogen.sh
|
|
-%configure F77=no
|
|
+%configure --disable-apparmor F77=no
|
|
# Fix binary-or-shlib-defines-rpath error
|
|
# Fix binary-or-shlib-defines-rpath error
|
|
%{__sed} -i '/AM_LDFLAGS = -Wl,-E -Wl,-rpath -Wl,$(libdir)/d' src/lxc/Makefile.in
|
|
%{__sed} -i '/AM_LDFLAGS = -Wl,-E -Wl,-rpath -Wl,$(libdir)/d' src/lxc/Makefile.in
|
|
%{__make} %{?_smp_mflags}
|
|
%{__make} %{?_smp_mflags}
|
|
@@ -91,8 +91,7 @@ This package contains documentation for %{name}.
|
|
rm -rf %{buildroot}
|
|
rm -rf %{buildroot}
|
|
%{__make} DESTDIR=%{buildroot} install
|
|
%{__make} DESTDIR=%{buildroot} install
|
|
find %{buildroot} -name '*.la' -delete
|
|
find %{buildroot} -name '*.la' -delete
|
|
-%{__mkdir} -p %{buildroot}%{_sharedstatedir}/%{name}
|
|
+%{__mkdir} -p %{buildroot}%{_var}/lib/%{name}
|
|
-%{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name}
|
|
|
|
|
|
|
|
%clean
|
|
%clean
|
|
%{__rm} -rf %{buildroot}
|
|
%{__rm} -rf %{buildroot}
|
|
@@ -106,25 +105,24 @@ find %{buildroot} -name '*.la' -delete
|
|
%doc AUTHORS COPYING README
|
|
%doc AUTHORS COPYING README
|
|
%{_bindir}/%{name}-*
|
|
%{_bindir}/%{name}-*
|
|
%{_mandir}/man*/%{name}*
|
|
%{_mandir}/man*/%{name}*
|
|
-%{_sharedstatedir}/%{name}
|
|
+%{_var}/lib/%{name}
|
|
-%{_localstatedir}/lib/%{name}
|
|
|
|
|
|
|
|
%files libs
|
|
%files libs
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
%doc AUTHORS COPYING
|
|
%doc AUTHORS COPYING
|
|
-%dir %{_libdir}/lxc
|
|
+%dir %{_datadir}/lxc
|
|
-%dir %{_libdir}/lxc/templates
|
|
+%dir %{_datadir}/lxc/templates
|
|
%{_libdir}/liblxc.so.*
|
|
%{_libdir}/liblxc.so.*
|
|
%{_libdir}/lxc/rootfs
|
|
%{_libdir}/lxc/rootfs
|
|
%{_libexecdir}/lxc/lxc-init
|
|
%{_libexecdir}/lxc/lxc-init
|
|
|
|
|
|
%files templates
|
|
%files templates
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
-%{_libdir}/lxc/templates/lxc-*
|
|
+%{_datadir}/lxc/templates/lxc-*
|
|
|
|
|
|
%files devel
|
|
%files devel
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
-%{_datadir}/pkgconfig/%{name}.pc
|
|
+%{_libdir}/pkgconfig/%{name}.pc
|
|
%{_includedir}/*
|
|
%{_includedir}/*
|
|
%{_libdir}/liblxc.so
|
|
%{_libdir}/liblxc.so
|
|
|
|
|
|
@@ -133,6 +131,9 @@ find %{buildroot} -name '*.la' -delete
|
|
%{_docdir}/%{name}
|
|
%{_docdir}/%{name}
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Nov 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.0-2
|
|
|
|
+- update to 0.8.0 release
|
|
|
|
+
|
|
* Fri May 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.0-1.20120525
|
|
* Fri May 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.0-1.20120525
|
|
- update to git master
|
|
- update to git master
|
|
|
|
|