diff options
| -rw-r--r-- | redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch | 48 | ||||
| -rw-r--r-- | redhat/dependencies/qt3/qt-3.3.8-fontrendering-214570.patch (renamed from redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch) | 0 | ||||
| -rw-r--r-- | redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec (renamed from redhat/extras/brp-check-trinity/brp-check-trinity.spec) | 0 | ||||
| -rw-r--r-- | redhat/main/tdenetwork/tdenetwork-14.0.0.spec | 10 |
4 files changed, 57 insertions, 1 deletions
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch b/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch new file mode 100644 index 000000000..c8dc7931e --- /dev/null +++ b/redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c122548..ad4f028 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,6 +226,34 @@ configure_file( config.h.cmake config.h @ONLY ) + + ##### write pkgconfig file ###################### + ++set( PC_LIB_REQUIRE "" ) ++if( WITH_ALSA ) ++ list( APPEND PC_LIB_REQUIRE "alsa" ) ++endif( WITH_ALSA ) ++if( WITH_AUDIOFILE ) ++ list( APPEND PC_LIB_REQUIRE "audiofile" ) ++endif( WITH_AUDIOFILE ) ++if( WITH_VORBIS ) ++ list( APPEND PC_LIB_REQUIRE "vorbis" ) ++ list( APPEND PC_LIB_REQUIRE "vorbisfile" ) ++endif( WITH_VORBIS ) ++if( WITH_MAD ) ++ list( APPEND PC_LIB_REQUIRE "mad" ) ++endif( WITH_MAD ) ++if( WITH_ESOUND ) ++ list( APPEND PC_LIB_REQUIRE "esound" ) ++endif( WITH_ESOUND ) ++if( WITH_JACK ) ++ list( APPEND PC_LIB_REQUIRE "jack" ) ++endif( WITH_JACK ) ++ ++list( LENGTH PC_LIB_REQUIRE PC_LIB_REQUIRES_FOUND ) ++if( PC_LIB_REQUIRES_FOUND GREATER 0 ) ++ string( REPLACE ";" " " PC_LIB_REQUIRES "Requires: ${PC_LIB_REQUIRE}" ) ++else( ) ++ set( PC_LIB_REQUIRES "" ) ++endif( ) ++ + string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} ) + string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} ) + string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} ) +diff --git a/arts.pc.cmake b/arts.pc.cmake +index 2c26a41..77332d2 100644 +--- a/arts.pc.cmake ++++ b/arts.pc.cmake +@@ -8,3 +8,4 @@ Description: Soundserver for the Trinity Desktop Environment (TDE) + Version: @ARTS_VERSION@ + Libs: -L${libdir} + Cflags: -I${includedir} ++@PC_LIB_REQUIRES@ diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-214570.patch index 41a74fba7..41a74fba7 100644 --- a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch +++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-214570.patch diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec index 5f2d31ea5..5f2d31ea5 100644 --- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec +++ b/redhat/extras/brp-check-trinity/brp-check-trinity-14.0.0.spec diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec index e6c0264b3..f4157c6d1 100644 --- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec @@ -95,6 +95,13 @@ BuildRequires: sqlite-devel BuildRequires: libgadu-devel %endif +# GAMIN support +# Not on openSUSE. +%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%define with_gamin 1 +BuildRequires: gamin-devel +%endif + # XTST support %if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210 BuildRequires: libXtst-devel @@ -127,7 +134,7 @@ BuildRequires: wireless-tools-devel %if 0%{?mgaversion} == 2 || 0%{?mdkversion} BuildRequires: %{_lib}iw29-devel %endif -%if 0%{?rhel} == 5 +%if 0%{?rhel} == 5 || 0%{?suse_version} BuildRequires: wireless-tools %endif %if 0%{?suse_version} || 0%{?mgaversion} >= 3 @@ -350,6 +357,7 @@ NFS and Samba. %{tde_tdelibdir}/kcm_kcmsambaconf.so %{tde_tdeappdir}/fileshare.desktop %{tde_tdeappdir}/kcmsambaconf.desktop +%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png %{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png %{tde_datadir}/services/fileshare_propsdlgplugin.desktop %{tde_tdedocdir}/HTML/en/kcontrol/fileshare/ |