Branch: master

b0440789 2014-10-18 15:21:49 François Andriot
RPM Packaging: update R14 packages
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdemultimedia/tdemultimedia-14.0.0.spec
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index b8eaebf..9961023 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -254,7 +254,7 @@
 %if "%{?suse_version}" == "1310"
 Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding-openSUSE
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 6fdc3e0..764be53 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -78,6 +78,7 @@
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	gcc-c++
 BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -99,7 +100,7 @@
 %{?with_mad:BuildRequires: trinity-akode-libmad}
 %endif
 
-BuildRequires:	desktop-file-utils
+# ZLIB support
 BuildRequires:	zlib-devel
 
 # MUSICBRAINZ support
@@ -1250,7 +1251,7 @@
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-  --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb" \
+  --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/artsc:%{tde_tdeincludedir}/arts" \
   \
   --with-cdparanoia \
   --with-flac \