diff options
author | François Andriot <albator78@libertysurf.fr> | 2014-10-18 22:21:49 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2014-10-18 22:21:49 +0200 |
commit | b044078982873fc5e30a2bb79b4bcd65e5ae806a (patch) | |
tree | 3ecad5f19ef3ed799b99d82b304d658941aebbf7 | |
parent | d3dc5fd301b768fe2d170ea83cf40d3e6cc94663 (diff) | |
download | tde-packaging-b044078982873fc5e30a2bb79b4bcd65e5ae806a.tar.gz tde-packaging-b044078982873fc5e30a2bb79b4bcd65e5ae806a.zip |
RPM Packaging: update R14 packages
-rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 2 | ||||
-rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index b8eaebf38..9961023be 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -254,7 +254,7 @@ Requires: hicolor-icon-theme-branding %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 6fdc3e084..764be53c2 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -78,6 +78,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} 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 @@ BuildRequires: trinity-akode-devel %{?with_mad:BuildRequires: trinity-akode-libmad} %endif -BuildRequires: desktop-file-utils +# ZLIB support BuildRequires: zlib-devel # MUSICBRAINZ support @@ -1250,7 +1251,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --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 \ |