rpms/banshee-mirage/devel banshee-mirage-locales-conflict.patch, NONE, 1.1 banshee-mirage.spec, 1.4, 1.5

[palango]

Author: palango

Update of /cvs/pkgs/rpms/banshee-mirage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28629

Modified Files:
	banshee-mirage.spec 
Added Files:
	banshee-mirage-locales-conflict.patch 
Log Message:
fix bug #506145

banshee-mirage-locales-conflict.patch:

--- NEW FILE banshee-mirage-locales-conflict.patch ---
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=506145 
diff -uraN mirage-0.5.0.orig/configure.ac mirage-0.5.0/configure.ac
--- mirage-0.5.0.orig/configure.ac	2009-07-01 19:11:40.780036448 +0200
+++ mirage-0.5.0/configure.ac	2009-07-01 19:12:16.891267070 +0200
@@ -14,7 +14,7 @@
 AC_PROG_LIBTOOL
 
 IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE=mirage
+GETTEXT_PACKAGE=banshee-mirage
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
 AM_GLIB_GNU_GETTEXT


Index: banshee-mirage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/banshee-mirage/devel/banshee-mirage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- banshee-mirage.spec	15 Jun 2009 01:02:46 -0000	1.4
+++ banshee-mirage.spec	2 Jul 2009 10:21:30 -0000	1.5
@@ -2,12 +2,13 @@
 
 Name:		banshee-mirage
 Version:	0.5.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An Automatic Playlist Generation Extension for Banshee
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://hop.at/mirage/
 Source0:	http://hop.at/mirage/download/mirage-%{version}.tar.gz
+Patch0:		banshee-mirage-locales-conflict.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gettext-devel, glib2-devel, mono-devel, banshee-devel, banshee-musicbrainz-devel, fftw-devel, libsamplerate-devel, intltool, taglib-sharp-devel, mono-addins-devel, sqlite-devel, gstreamer-devel, gstreamer-plugins-base-devel, make, ndesk-dbus-glib-devel, ndesk-dbus-devel, gtk-sharp2-devel
 
@@ -19,6 +20,7 @@ An Automatic Playlist Generation Extensi
 
 %prep
 %setup -q -n mirage-%{version}
+%patch0 -p1 -b banshee-mirage-locales-conflict.patch
 
 %build
 %configure
@@ -34,12 +36,12 @@ find %{buildroot} -name '*.a' -exec rm -
 
 strip --strip-unneeded %{buildroot}/%{_libdir}/libmirageaudio.so
 
-%find_lang mirage
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%files -f mirage.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/banshee-1/Extensions/Banshee.Mirage.*
@@ -47,6 +49,9 @@ strip --strip-unneeded %{buildroot}/%{_l
 %{_libdir}/libmirageaudio.so
 
 %changelog
+* Thu Jul 02 2009 Paul Lange <palango at gmx.de> - 0.5.0-3
+- Fix translation conflicts with mirage (#506145)
+
 * Sun Jun 14 2009 Paul Lange <palango at gmx.de> - 0.5.0-2
 - Disable ppc64 target