Author: pluto Date: Sat Aug 29 09:03:43 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix install error.
/usr/bin/install: will not overwrite just-created
`/tmp/bmpx-0.40.14-../usr/share/doc/bmpx/images/favicon.ico' with `favicon.ico'
---- Files affected:
packages/bmpx:
bmpx.spec (1.99 -> 1.100) , bmpx-am.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/bmpx/bmpx.spec
diff -u packages/bmpx/bmpx.spec:1.99 packages/bmpx/bmpx.spec:1.100
--- packages/bmpx/bmpx.spec:1.99 Sat Aug 29 10:47:58 2009
+++ packages/bmpx/bmpx.spec Sat Aug 29 11:03:38 2009
@@ -16,6 +16,7 @@
Patch1: %{name}-libsoup24.patch
Patch2: %{name}-sidplay.patch
Patch3: %{name}-c++.patch
+Patch4: %{name}-am.patch
URL: http://bmpx.backtrace.info/
BuildRequires: alsa-lib-devel >= 1.0.9
BuildRequires: autoconf >= 2.60
@@ -128,6 +129,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
@@ -215,6 +217,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.100 2009/08/29 09:03:38 pluto
+- fix install error.
+ /usr/bin/install: will not overwrite just-created
`/tmp/bmpx-0.40.14-../usr/share/doc/bmpx/images/favicon.ico' with `favicon.ico'
+
Revision 1.99 2009/08/29 08:47:58 pluto
- compilation fixes merged.
================================================================
Index: packages/bmpx/bmpx-am.patch
diff -u /dev/null packages/bmpx/bmpx-am.patch:1.1
--- /dev/null Sat Aug 29 11:03:43 2009
+++ packages/bmpx/bmpx-am.patch Sat Aug 29 11:03:38 2009
@@ -0,0 +1,22 @@
+fix:
+/usr/bin/install: will not overwrite just-created
`/tmp/bmpx-0.40.14-.../usr/share/doc/bmpx/images/favicon.ico' with `favicon.ico'
+
+--- bmpx-0.40.14/docs/images/Makefile.am.orig 2009-08-29 10:46:32.000000000
+0200
++++ bmpx-0.40.14/docs/images/Makefile.am 2009-08-29 10:53:10.466659295
+0200
+@@ -1,4 +1,4 @@
+-image_DATA=main-window.png bmp.png active-source.png playing-source.png
important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
favicon.ico
++image_DATA=main-window.png bmp.png active-source.png playing-source.png
important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
+ imagedir=$(prefix)/share/doc/@PACKAGE@/images
+
+ EXTRA_DIST=$(image_DATA)
+--- bmpx-0.40.14/docs/images/Makefile.in.orig 2009-08-29 10:52:07.000000000
+0200
++++ bmpx-0.40.14/docs/images/Makefile.in 2009-08-29 10:52:57.915461632
+0200
+@@ -313,7 +313,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-image_DATA = main-window.png bmp.png active-source.png playing-source.png
important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
favicon.ico
++image_DATA = main-window.png bmp.png active-source.png playing-source.png
important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
+ imagedir = $(prefix)/share/doc/@PACKAGE@/images
+ EXTRA_DIST = $(image_DATA)
+ all: all-am
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bmpx/bmpx.spec?r1=1.99&r2=1.100&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
