- more Suggests

- use --with-omf
- sr@Latn -> sr@latin
- release 2

Changed files:
    sound-juicer.spec -> 1.65

diff --git a/sound-juicer.spec b/sound-juicer.spec
index f082ab78610d0a790fc2a41bab6994beafc34865..3f138b98af08539b1986e6c11f2434ea2b292182 100644 (file)
--- a/sound-juicer.spec
+++ b/sound-juicer.spec
@@ -2,10 +2,10 @@ Summary:      CD ripper
 Summary(pl.UTF-8):     Ripper płyt CD
 Name:          sound-juicer
 Version:       2.20.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
-Source0:       http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.20/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/sound-juicer/2.20/%{name}-%{version}.tar.bz2
 # Source0-md5: cea3c67215c99acf513ee7ea4b5eba7b
 Patch0:                %{name}-desktop.patch
 URL:           http://www.burtonini.com/blog/computers/sound-juicer/
@@ -26,6 +26,8 @@ BuildRequires:        libmusicbrainz-devel >= 2.1.0
 BuildRequires: libtool
 BuildRequires: nautilus-cd-burner-devel >= 2.20.0
 BuildRequires: pkgconfig
+# support for --with-omf in find_lang.sh
+BuildRequires: rpm-build >= 4.4.9-10
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper >= 0.3.5
 Requires(post,postun): gtk+2
@@ -37,7 +39,11 @@ Requires:    libgnomeui >= 2.20.0
 Requires:      nautilus-cd-burner-libs >= 2.20.0
 Suggests:      gstreamer-audio-formats
 Suggests:      gstreamer-flac
+Suggests:      gstreamer-lame
+Suggests:      gstreamer-taglib
 Suggests:      gstreamer-vorbis
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -69,7 +75,9 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-%find_lang %{name} --with-gnome
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,6 +101,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_mandir}/man1/sound-juicer.1*
 %{_desktopdir}/sound-juicer.desktop
-%{_omf_dest_dir}/%{name}
 %{_iconsdir}/hicolor/*/apps/*
 %{_sysconfdir}/gconf/schemas/sound-juicer.schemas