devel/mach .cvsignore,1.2,1.3 mach.spec,1.5,1.6 sources,1.2,1.3
Thomas Vander Stichele (thomasvs)
fedora-extras-commits at redhat.com
Fri Nov 25 19:11:39 UTC 2005
Author: thomasvs
Update of /cvs/extras/devel/mach
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27541
Modified Files:
.cvsignore mach.spec sources
Log Message:
update for new release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/mach/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:50:34 -0000 1.2
+++ .cvsignore 25 Nov 2005 19:11:37 -0000 1.3
@@ -1 +1 @@
-mach-0.4.5.tar.bz2
+mach-0.4.8.tar.bz2
Index: mach.spec
===================================================================
RCS file: /cvs/extras/devel/mach/mach.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mach.spec 5 Mar 2005 21:10:23 -0000 1.5
+++ mach.spec 25 Nov 2005 19:11:37 -0000 1.6
@@ -1,29 +1,33 @@
Name: mach
-Version: 0.4.5
-Release: 1
+Version: 0.4.8
+Release: 1%{?dist}
Summary: make a chroot
Group: Applications/System
-License: GPL
+License: GPL
URL: http://thomas.apestaart.org/projects/mach/
Source: http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: python
-Requires: rpm
-Requires: rpm-python
-Requires: apt
-Requires: sed
-Requires: cpio
-
-BuildRequires: python
+Requires: python
+Requires: rpm
+Requires: rpm-build
+Requires: rpm-python
+Requires: yum
+Requires: createrepo
+Requires: sed
+Requires: cpio
+
+BuildRequires: python
+BuildRequires: gcc-c++
+BuildRequires: libselinux-devel
%{!?builduser: %define builduser machbuild}
%{!?buildgroup: %define buildgroup machbuild}
%description
mach makes a chroot.
-Using apt-get and a suid binary, it manages to install clean chroot
+Using yum or apt-get and a suid binary, it manages to install clean chroot
environments based on the original packages for that distribution.
The clean root can be used to run jail roots, to create image files, or
@@ -34,19 +38,13 @@
Thomas Vander Stichele (thomas (at) apestaart (dot) org)
%prep
-echo "
---------------------------------------------------------------
-Update needed. The changes in mach-0.4.6-0.fdr.1.2.src.rpm
-would be insufficient for FC3.
---------------------------------------------------------------" > /dev/null
-exit 1
%setup -q
%build
%configure \
--enable-builduser=%{builduser} \
--enable-buildgroup=%{buildgroup} \
- --with-flavor=fedora-stable
+ --with-flavor=extras
make
%install
@@ -59,13 +57,13 @@
install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/packages
install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/archives
+find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
+
%clean
rm -rf $RPM_BUILD_ROOT
%pre
-# create user and group mach
-/usr/sbin/useradd -c "mach user" \
- -r -m mach -d %{_localstatedir}/lib/mach > /dev/null 2>&1 || :
+groupadd -r mach >/dev/null 2>&1 || :
%preun
if [ "$1" == 0 ];
@@ -73,7 +71,7 @@
# last removal
# be a good boy and clean out the dirs we filled with junk
rm -rf %{_localstatedir}/lib/mach/states/*
- umount %{_localstatedir}/lib/mach/roots/*/proc > /dev/null 2>%1 || :
+ umount %{_localstatedir}/lib/mach/roots/*/proc > /dev/null 2>&1 || :
rm -rf %{_localstatedir}/lib/mach/roots/*
rm -rf %{_localstatedir}/cache/mach/* > /dev/null 2>&1 || :
rmdir %{_localstatedir}/lib/mach/states > /dev/null 2>&1 || :
@@ -82,31 +80,40 @@
rm -rf %{_localstatedir}/tmp/mach > /dev/null 2>&1 || :
fi
-%postun
-if [ "$1" = "0" ];
-then
- # last removal
- userdel mach > /dev/null 2>&1 || :
- groupdel mach > /dev/null 2>&1 || :
-fi
-
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
%dir %{_sysconfdir}/mach
%config %{_sysconfdir}/mach/conf
-%config %{_sysconfdir}/mach/location
+%config(noreplace) %{_sysconfdir}/mach/location
%config %{_sysconfdir}/mach/dist.d
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach/states
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach/roots
-%ghost %attr(2775,mach,mach) %dir %{_localstatedir}/tmp/mach
-%attr(2775,mach,mach) %dir %{_localstatedir}/cache/mach/packages
-%attr(2775,mach,mach) %dir %{_localstatedir}/cache/mach/archives
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/states
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/roots
+%ghost %attr(2775,root,mach) %dir %{_localstatedir}/tmp/mach
+%attr(2775,root,mach) %{_localstatedir}/cache/mach
%{_bindir}/mach
+%{_libdir}/libselinux-mach.*
%attr(04750,root,mach) %{_sbindir}/mach-helper
%changelog
+* Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.8
+- new release
+
+* Mon Aug 9 2004 Ville Skyttä <ville.skytta at iki.fi>
+- Create only the "mach" group, and do not remove it on erase. The
+ "mach" user is not really needed for anything.
+
+* Sun Jun 6 2004 Ville Skyttä <ville.skytta at iki.fi>
+- Properly redirect STDERR from umount to /dev/null at erase time.
+
+* Wed Apr 14 2004 Ville Skyttä <ville.skytta at iki.fi>
+- Own %%{_localstatedir}/mach, thanks to John Dalbec for the catch.
+
+* Thu Apr 8 2004 Ville Skyttä <ville.skytta at iki.fi>
+- Require apt >= 0.5.5cnc2 due to internal use of the "rpm-dir" index type.
+
* Tue Mar 16 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- package dist.d and location
Index: sources
===================================================================
RCS file: /cvs/extras/devel/mach/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:50:34 -0000 1.2
+++ sources 25 Nov 2005 19:11:37 -0000 1.3
@@ -1 +1 @@
-5faad3c80423ee11ede5924c32331176 mach-0.4.5.tar.bz2
+3fc32634295ea1cb859d67b5df8e0e65 mach-0.4.8.tar.bz2
More information about the fedora-extras-commits
mailing list