Author: glen Date: Sat Dec 18 23:39:12 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.41
---- Files affected: packages/os-prober: os-prober.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/os-prober/os-prober.spec diff -u packages/os-prober/os-prober.spec:1.1 packages/os-prober/os-prober.spec:1.2 --- packages/os-prober/os-prober.spec:1.1 Sat Dec 18 20:55:01 2010 +++ packages/os-prober/os-prober.spec Sun Dec 19 00:39:07 2010 @@ -1,12 +1,12 @@ # $Revision$, $Date$ Summary: Utilities that detect other operating system installs on a set of drives Name: os-prober -Version: 1.22 +Version: 1.41 Release: 1 License: GPL Group: Base/Kernel URL: http://packages.qa.debian.org/o/os-prober.html -Source0: http://ftp.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.bz2 +Source0: http://ftp.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz # Source0-md5: 89c7744bb1dd3ff09ffbd896ff0baea0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -19,14 +19,20 @@ on them, and work out how to boot other linux installs. %prep -%setup -q +%setup -q -n %{name} + +%build +%{__make} \ + CC="%{__cc}" + CFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/var/lib/os-prober,%{_bindir},%{_datadir}/%{name}} +install -d $RPM_BUILD_ROOT{/var/lib/%{name},%{_bindir},%{_datadir}/%{name},%{_libdir}/%{name}} install -p %{name} $RPM_BUILD_ROOT%{_bindir} install -p linux-boot-prober $RPM_BUILD_ROOT%{_bindir} cp -a common.sh $RPM_BUILD_ROOT%{_datadir}/%{name} +install -p newns $RPM_BUILD_ROOT%{_libdir}/%{name} %ifarch m68k ARCH=m68k @@ -40,15 +46,19 @@ %ifarch %{ix86} %{x8664} ARCH=x86 %endif -for i in os-probes os-probes/mounted os-probes/init \ - linux-boot-probes linux-boot-probes/mounted; do - install -d $RPM_BUILD_ROOT%{_libdir}/$i - cp -a $i/common/* $RPM_BUILD_ROOT%{_libdir}/$i - if [ -e "$i/$ARCH" ]; then - cp -a $i/$ARCH/* $RPM_BUILD_ROOT%{_libdir}/$i +for probes in os-probes os-probes/mounted os-probes/init \ + linux-boot-probes linux-boot-probes/mounted; do \ + install -d $RPM_BUILD_ROOT%{_libdir}/$probes + cp -a $probes/common/* $RPM_BUILD_ROOT%{_libdir}/$probes + if [ -e "$probes/$ARCH" ]; then + cp -a $probes/$ARCH/* $RPM_BUILD_ROOT%{_libdir}/$probes fi done +if [ "$ARCH" = x86 ]; then + cp -a os-probes/mounted/powerpc/20macosx $RPM_BUILD_ROOT%{_libdir}/os-probes/mounted +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -57,9 +67,11 @@ %doc README TODO debian/changelog debian/copyright %attr(755,root,root) %{_bindir}/*prober %dir %{_libdir}/os-probes -%{_libdir}/os-probes/* +%attr(755,root,root) %{_libdir}/os-probes/* +%dir %{_libdir}/os-prober +%attr(755,root,root) %{_libdir}/os-prober/newns %dir %{_libdir}/linux-boot-probes -%{_libdir}/linux-boot-probes/* +%attr(755,root,root) %{_libdir}/linux-boot-probes/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/common.sh %dir /var/lib/os-prober @@ -70,5 +82,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2010/12/18 23:39:07 glen +- up to 1.41 + Revision 1.1 2010/12/18 19:55:01 glen - new, based on PCLinuxOS src.rpm ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/os-prober/os-prober.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
