Author: glen Date: Sun Jan 28 18:53:28 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - use inline edit - adapter, cosmetics
---- Files affected: SPECS: schroot.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/schroot.spec diff -u SPECS/schroot.spec:1.3 SPECS/schroot.spec:1.4 --- SPECS/schroot.spec:1.3 Sun Jan 28 19:38:31 2007 +++ SPECS/schroot.spec Sun Jan 28 19:53:23 2007 @@ -8,7 +8,7 @@ Release: 0.1 License: GPL Group: Applications/System -Source0: http://ftp.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.orig.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/s/schroot/%{name}_%{version}.orig.tar.gz # Source0-md5: 7b108d025c4221599e5901d0c9b664bd URL: http://packages.qa.debian.org/s/schroot.html BuildRequires: autoconf @@ -24,6 +24,7 @@ BuildRequires: libuuid-devel BuildRequires: lockdev-devel BuildRequires: pam-devel +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -45,8 +46,7 @@ %{__autoconf} # workaround for g++ problems with arguments sequence -cp configure configure.bak -cat configure.bak | sed -r "s:^(ac_link=.*)(-o conftest.*)(conftest.*ac_ext)(.*):\1 \3 \2 \4:" > configure +sed -r -i -e "s:^(ac_link=.*)(-o conftest.*)(conftest.*ac_ext)(.*):\1 \3 \2 \4:" configure %configure @@ -59,12 +59,12 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -cat > do_chroot << EOF +cat > do_chroot << 'EOF' #!/bin/sh -exec schroot -p -q -- "\`basename \$0\`" "\$@" +exec schroot -p -q -- "`basename $0`" "$@" EOF - + install do_chroot $RPM_BUILD_ROOT%{_bindir} %find_lang %{name} --all-name @@ -76,9 +76,9 @@ %defattr(644,root,root,755) %doc README TODO debian/changelog %{_mandir}/man?/* -%dir /etc/%{name} -%dir /etc/%{name}/exec.d -%dir /etc/%{name}/setup.d +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/exec.d +%dir %{_sysconfdir}/%{name}/setup.d %dir %{_libdir}/%{name} %dir /var/lib/%{name} %dir /var/lib/%{name}/mount @@ -86,10 +86,10 @@ %attr(4755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/do_chroot %attr(755,root,root) %{_libdir}/%{name}/* -%attr(755,root,root) /etc/%{name}/exec.d/* -%attr(755,root,root) /etc/%{name}/setup.d/* +%attr(755,root,root) %{_sysconfdir}/%{name}/exec.d/* +%attr(755,root,root) %{_sysconfdir}/%{name}/setup.d/* %attr(640,root,root) %verify(not md5 mtime size) %config(noreplace) /etc/pam.d/%{name} -%attr(640,root,root) %verify(not md5 mtime size) %config(noreplace) /etc/%{name}/%{name}.conf +%attr(640,root,root) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -97,6 +97,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2007/01/28 18:53:23 glen +- use inline edit +- adapter, cosmetics + Revision 1.3 2007/01/28 18:38:31 pascalek - removed autoconf patch (replaced with workaround for old boost compatibility) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/schroot.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
