- fixed hal build, reverted hal bcond, rel.1, tested - ready for STBR

[packages/sound-juicer.git] / sound-juicer.spec

diff --git a/sound-juicer.spec b/sound-juicer.spec
index f01e47410cf229c78a2bc43445ef16c2ceb7f992..596bba20b08b8e252852efbe84f0ff3a7a8199ff 100644 (file)
--- a/sound-juicer.spec
+++ b/sound-juicer.spec
@@ -1,30 +1,34 @@
+# Conditional build
+%bcond_without hal     # disable HAL support
+#
 Summary:       CD ripper
 Summary(pl):   Ripper p³yt CD
 Name:          sound-juicer
-Version:       0.5.10.1
-Release:       3
+Version:       0.5.13
+Release:       1
 License:       GPL
 Group:         X11/Applications/Multimedia
 Source0:       http://www.burtonini.com/computing/%{name}-%{version}.tar.gz
-# Source0-md5: a879cce136a1f26274f0cb1906fbec71
-Patch0:                %{name}-locale-names.patch
-Patch1:                %{name}-gstreamer08.patch
+# Source0-md5: 0b3fcd80d91c78153961378b5c2f01a3
+Patch0:                %{name}-hal_build_fixes.patch
 URL:           http://www.burtonini.com/blog/computers/sound-juicer/
 BuildRequires: GConf2-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gtk+2-devel
-BuildRequires: gstreamer-cdparanoia >= 0.6.1
-BuildRequires: gstreamer-devel >= 0.6.1
-BuildRequires: gstreamer-vorbis >= 0.6.1
+BuildRequires: gstreamer-cdparanoia >= 0.8.1
+BuildRequires: gstreamer-devel >= 0.8.3
+BuildRequires: gstreamer-vorbis >= 0.8.1
+%{?with_hal:BuildRequires:     hal-devel >= 0.2.98}
 Buildrequires: intltool >= 0.20
 BuildRequires: libglade2-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: libmusicbrainz-devel >= 2.1.0
+BuildRequires: scrollkeeper >= 0.3.5
 Requires(post):        GConf2
 Requires(post):        scrollkeeper
-Requires:      gstreamer-cdparanoia >= 0.6.1
-Requires:      gstreamer-vorbis >= 0.6.1
+Requires:      gstreamer-cdparanoia >= 0.8.1
+Requires:      gstreamer-vorbis >= 0.8.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,16 +40,14 @@ Sound Juicer, ripper p
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-mv po/{no,nb}.po
 
 %build
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable--schemas-install
+       --disable--schemas-install \
+       --%{?with_hal:en}%{!?with_hal:dis}able-hal
 
 %{__make}
 
@@ -56,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome
 
 %clean