Author: glen Date: Sun Jun 28 16:45:45 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- remove conflicting files instead
---- Files affected:
packages/rpm-build-tools:
rpm-build-tools.spec (1.16 -> 1.17) , adapter (1.4 -> NONE) (REMOVED),
builder (1.24 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/rpm-build-tools/rpm-build-tools.spec
diff -u packages/rpm-build-tools/rpm-build-tools.spec:1.16
packages/rpm-build-tools/rpm-build-tools.spec:1.17
--- packages/rpm-build-tools/rpm-build-tools.spec:1.16 Sun Jun 28 01:29:19 2009
+++ packages/rpm-build-tools/rpm-build-tools.spec Sun Jun 28 18:45:40 2009
@@ -11,9 +11,9 @@
License: GPL
Group: Applications/File
Group: Base
-Source0: builder
+Source0: builder.sh
Source1: adapter.awk
-Source2: adapter
+Source2: adapter.sh
Source3: pldnotify.awk
BuildRequires: sed >= 4.0
Requires: gawk
@@ -51,18 +51,20 @@
%prep
%setup -qcT
-cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} .
+cp -p %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} .
-%{__sed} -i -e 's,^adapter=.*/adapter.awk,adapter=%{_libdir}/adapter.awk,'
adapter
+%{__sed} -i -e 's,^adapter=.*/adapter.awk,adapter=%{_libdir}/adapter.awk,'
adapter.sh
-%{__sed} -i -e '/^RCSID=/,/^rev=/d;/^VERSION=/s,\([^/]\+\)/.*",\1-RELEASE",'
builder adapter
+%{__sed} -i -e '/^RCSID=/,/^rev=/d;/^VERSION=/s,\([^/]\+\)/.*",\1-RELEASE",'
builder.sh adapter.sh
%{__sed} -i -e '/\tRCSID =/,/^\trev =/d;/\tVERSION =
/s,\([^/]\+\)/.*,\1-RELEASE",' adapter.awk
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}}
cp -a adapter.awk $RPM_BUILD_ROOT%{_libdir}/adapter.awk
-install pldnotify.awk builder adapter $RPM_BUILD_ROOT%{_bindir}
+install -p pldnotify.awk $RPM_BUILD_ROOT%{_bindir}
+install -p builder.sh $RPM_BUILD_ROOT%{_bindir}/builder
+install -p adapter.sh $RPM_BUILD_ROOT%{_bindir}/adapter
%clean
rm -rf $RPM_BUILD_ROOT
@@ -80,6 +82,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2009/06/28 16:45:40 glen
+- remove conflicting files instead
+
Revision 1.16 2009/06/27 23:29:19 qwiat
- copy files instead symlinks into build directory
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-tools/rpm-build-tools.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
