Author: glen Date: Sun Nov 22 09:48:28 2009 GMT Module: packages Tag: HEAD ---- Log message: - don't trash bindir, move -cli to libdir; rel 3
---- Files affected: packages/binfmt-detector: binfmt-detector.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: packages/binfmt-detector/binfmt-detector.spec diff -u packages/binfmt-detector/binfmt-detector.spec:1.13 packages/binfmt-detector/binfmt-detector.spec:1.14 --- packages/binfmt-detector/binfmt-detector.spec:1.13 Sun Nov 22 10:27:28 2009 +++ packages/binfmt-detector/binfmt-detector.spec Sun Nov 22 10:48:23 2009 @@ -3,13 +3,16 @@ Summary(pl.UTF-8): Detector typu plików wykonywalnych PE Microsoftu Name: binfmt-detector Version: 0.2 -Release: 2 +Release: 3 License: GPL Group: Base Source0: http://team.pld-linux.org/~wolf/%{name}.tar.gz # Source0-md5: d6e9d6d8888b58c97eb65875853fd778 Source1: %{name}.init +Patch0: spelling.patch +Patch1: libdir.patch BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts Conflicts: wine < 1:0.9.12-2 @@ -38,18 +41,20 @@ %prep %setup -q -n %{name} +%patch0 -p1 +%patch1 -p1 %build -%{__cc} %{rpmcflags} binfmt-detector-cli.c -o binfmt-detector-cli +%{__cc} %{rpmldflags} %{rpmcflags} binfmt-detector-cli.c -o binfmt-detector %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},/etc/rc.d/init.d} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/etc/rc.d/init.d} -install binfmt-detector-cli $RPM_BUILD_ROOT%{_bindir} -install binfmt-detector.sh $RPM_BUILD_ROOT%{_bindir} - -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/binfmt-detector +install -p binfmt-detector $RPM_BUILD_ROOT%{_libdir} +install -p binfmt-detector.sh $RPM_BUILD_ROOT%{_bindir}/binfmt-detector +sed -i -e 's,/usr/lib,%{_libdir},' $RPM_BUILD_ROOT%{_bindir}/binfmt-detector +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/binfmt-detector %clean rm -rf $RPM_BUILD_ROOT @@ -67,8 +72,9 @@ %files %defattr(644,root,root,755) %doc README -%attr(755,root,root) %{_bindir}/* %attr(754,root,root) /etc/rc.d/init.d/binfmt-detector +%attr(755,root,root) %{_bindir}/binfmt-detector +%attr(755,root,root) %{_libdir}/binfmt-detector %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -76,6 +82,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2009/11/22 09:48:23 glen +- don't trash bindir, move -cli to libdir; rel 3 + Revision 1.13 2009/11/22 09:27:28 glen - <= is evil, use < ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/binfmt-detector/binfmt-detector.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit