- 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'

Changed files:
    bmpx-am.patch -> 1.1
    bmpx.spec -> 1.100

diff --git a/bmpx-am.patch b/bmpx-am.patch
new file mode 100644 (file)
index 0000000..799d736
--- /dev/null
+++ b/bmpx-am.patch
@@ -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

diff --git a/bmpx.spec b/bmpx.spec
index 00ca1de6d0bdbd03e7a62f8132eee28672cdd748..e2572f5ea4622b7abd2f5d35e70b10f0e38b2aad 100644 (file)
--- a/bmpx.spec
+++ b/bmpx.spec
@@ -15,6 +15,7 @@ Patch0:               %{name}-lib64.patch
 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
@@ -127,6 +128,7 @@ lastfm:// do BMPx.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}