- merged from DEVEL

Changed files:
    sound-juicer-desktop.patch -> 1.3
    sound-juicer.spec -> 1.41

diff --git a/sound-juicer-desktop.patch b/sound-juicer-desktop.patch
index c967978ce97d8892a3e3ef1f5fe559fad83626c1..16bcd4cfccdd654577e318b1294415b0ea3b2c59 100644 (file)
--- a/sound-juicer-desktop.patch
+++ b/sound-juicer-desktop.patch
@@ -5,7 +5,7 @@ diff -urN sound-juicer-0.6.0.orig/data/sound-juicer.desktop.in sound-juicer-0.6.
  StartupNotify=true
  Terminal=false
  Type=Application
--Categories=GNOME;Application;AudioVideo;
+-Categories=GNOME;GTK;Application;AudioVideo;
 +Categories=GTK;GNOME;AudioVideo;Audio;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=sound-juicer

diff --git a/sound-juicer.spec b/sound-juicer.spec
index 425ca33ff5b79a8dc6ed63fed75dea90e3c7de21..85a825b2a39419f8d6a25bec685f07454a40fa32 100644 (file)
--- a/sound-juicer.spec
+++ b/sound-juicer.spec
@@ -1,12 +1,12 @@
 Summary:       CD ripper
 Summary(pl):   Ripper p³yt CD
 Name:          sound-juicer
-Version:       2.12.3
-Release:       1
+Version:       2.14.0
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
-Source0:       http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 395395c26b035d466f145dc908021a7f
+Source0:       http://ftp.gnome.org/pub/gnome/sources/sound-juicer/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 6cca302ece8377ac84d678078c0f6607
 Patch0:                %{name}-desktop.patch
 URL:           http://www.burtonini.com/blog/computers/sound-juicer/
 BuildRequires: GConf2-devel
@@ -15,21 +15,22 @@ BuildRequires:      automake >= 1.9
 BuildRequires: gnome-doc-utils >= 0.3.1-2
 BuildRequires: gnome-media-devel >= 2.11.91
 BuildRequires: gnome-vfs2-devel >= 2.10.0-2
-BuildRequires: gstreamer-GConf-devel >= 0.8.8
-BuildRequires: gstreamer-devel >= 0.8.9
+BuildRequires: gstreamer-plugins-base-devel >= 0.10.3
 BuildRequires: gtk+2-devel >= 2:2.8.0
 BuildRequires: intltool >= 0.33
+BuildRequires: libcdio-devel
 BuildRequires: libglade2-devel
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: libgnomeui-devel >= 2.13.0
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: libtool
-BuildRequires: nautilus-cd-burner-devel >= 2.12.0
+BuildRequires: nautilus-cd-burner-devel >= 2.13.93
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.3.5
 Requires(post,preun):  GConf2
 Requires(post,postun): scrollkeeper
-Requires:      gstreamer-cdparanoia >= 0.8.8
+Requires:      gstreamer-cdparanoia >= 0.10
+Requires:      hicolor-icon-theme
 Requires:      nautilus-cd-burner-libs >= 2.12.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,7 +52,8 @@ gnome-doc-prepare --copy --force
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable--schemas-install
+       --disable-schemas-install \
+       --disable-scrollkeeper
 %{__make}
 
 %install
@@ -92,5 +94,5 @@ EOF
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_omf_dest_dir}/%{name}
-%{_pixmapsdir}/*
+%{_iconsdir}/hicolor/*/apps/*
 %{_sysconfdir}/gconf/schemas/sound-juicer.schemas