d640e1e7 | 2017-06-24 13:54:25 | François Andriot |
RPM: fix LDAP related packages FTBFS on newer distributions |
||
M redhat/applications/kcmldap/kcmldap-14.0.0.spec M redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec M redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec M redhat/applications/kerberostray/kerberostray-14.0.0.spec M redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec |
||
diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index 48b9724..24ccd2b 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -177,6 +177,19 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +extra_includes="%{_includedir}" +extra_libs="%{_libdir}" + +if [ -d "%{_includedir}/openldap24" ]; then + extra_includes="%{_includedir}/openldap24:${extra_includes}" + extra_libs="%{_libdir}/openldap24:${extra_libs}" +fi + +if [ -d "%{_includedir}/heimdal" ]; then + extra_includes="%{_includedir}/heimdal:${extra_includes}" + extra_libs="%{_libdir}/heimdal:${extra_libs}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -194,10 +207,8 @@ --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?rhel} == 5 - --with-extra-includes=/usr/include/openldap24 \ - --with-extra-libs=%{_libdir}/openldap24 \ -%endif + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index 9191e9b..f3f5861 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -161,6 +161,19 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +extra_includes="%{_includedir}" +extra_libs="%{_libdir}" + +if [ -d "%{_includedir}/openldap24" ]; then + extra_includes="%{_includedir}/openldap24:${extra_includes}" + extra_libs="%{_libdir}/openldap24:${extra_libs}" +fi + +if [ -d "%{_includedir}/heimdal" ]; then + extra_includes="%{_includedir}/heimdal:${extra_includes}" + extra_libs="%{_libdir}/heimdal:${extra_libs}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -178,10 +191,8 @@ --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?rhel} == 5 - --with-extra-includes=/usr/include/openldap24 \ - --with-extra-libs=%{_libdir}/openldap24 \ -%endif + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec index f9fb335..008da62 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec @@ -155,6 +155,19 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +extra_includes="%{_includedir}" +extra_libs="%{_libdir}" + +if [ -d "%{_includedir}/openldap24" ]; then + extra_includes="%{_includedir}/openldap24:${extra_includes}" + extra_libs="%{_libdir}/openldap24:${extra_libs}" +fi + +if [ -d "%{_includedir}/heimdal" ]; then + extra_includes="%{_includedir}/heimdal:${extra_includes}" + extra_libs="%{_libdir}/heimdal:${extra_libs}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -172,10 +185,8 @@ --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?rhel} == 5 - --with-extra-includes=/usr/include/openldap24 \ - --with-extra-libs=%{_libdir}/openldap24 \ -%endif + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec index 7b3af24..de55e48 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec @@ -134,6 +134,19 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +extra_includes="%{_includedir}" +extra_libs="%{_libdir}" + +if [ -d "%{_includedir}/openldap24" ]; then + extra_includes="%{_includedir}/openldap24:${extra_includes}" + extra_libs="%{_libdir}/openldap24:${extra_libs}" +fi + +if [ -d "%{_includedir}/heimdal" ]; then + extra_includes="%{_includedir}/heimdal:${extra_includes}" + extra_libs="%{_libdir}/heimdal:${extra_libs}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -151,10 +164,8 @@ --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?rhel} == 5 - --with-extra-includes=/usr/include/openldap24 \ - --with-extra-libs=%{_libdir}/openldap24 \ -%endif + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec index 458cf96..c13dbe2 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec @@ -163,6 +163,19 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +extra_includes="%{_includedir}" +extra_libs="%{_libdir}" + +if [ -d "%{_includedir}/openldap24" ]; then + extra_includes="%{_includedir}/openldap24:${extra_includes}" + extra_libs="%{_libdir}/openldap24:${extra_libs}" +fi + +if [ -d "%{_includedir}/heimdal" ]; then + extra_includes="%{_includedir}/heimdal:${extra_includes}" + extra_libs="%{_libdir}/heimdal:${extra_libs}" +fi + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -179,14 +192,8 @@ --enable-rpath \ --disable-gcc-hidden-visibility \ \ -%if 0%{?rhel} == 5 - --with-extra-includes=%{_includedir}/openldap24 \ - --with-extra-libs=%{_libdir}/openldap24 \ -%endif -%if 0%{?rhel} >= 6 - --with-extra-includes=%{_includedir}/heimdal \ - --with-extra-libs=%{_libdir}/heimdal \ -%endif + --with-extra-includes=${extra_includes} \ + --with-extra-libs=${extra_libs} \ %__make %{?_smp_mflags} |
||
7031b5a6 | 2017-06-24 13:54:25 | François Andriot |
RPM: add mp4v2 dependency to amarok |
||
M redhat/Makefile.r14 |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index a9497c6..5a00615 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -233,6 +233,13 @@ $(call buildpkg,3rdparty/mftrace) endif + +mp4v2: +# Build on OpenSUSE only +ifneq ($(wildcard /etc/SuSE-release),) + $(call buildpkg,3rdparty/mp4v2) +endif + pcsc-perl: # Build on CentOS ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) @@ -319,7 +326,7 @@ adept: tdebase $(call buildpkg,applications/adept) -amarok: tdebase cmake +amarok: tdebase cmake mp4v2 $(call buildpkg,applications/amarok) basket: tdebase |
||
8f04fcad | 2017-06-24 13:54:26 | François Andriot |
RPM: add libkipi dependency to ksquirrel |
||
M redhat/Makefile.r14 |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 5a00615..625c313 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -582,7 +582,7 @@ ksplash-engine-moodin: tdebase $(call buildpkg,applications/ksplash-engine-moodin) -ksquirrel: tdebase libksquirrel +ksquirrel: tdebase libkipi libksquirrel $(call buildpkg,applications/ksquirrel) kstreamripper: tdebase |
||
4e262d6f | 2017-06-24 13:54:26 | François Andriot |
RPM: fix audio related dependencies in akode, tqt3 for opensuse distributions |
||
M redhat/dependencies/akode/akode-14.0.0.spec M redhat/dependencies/tqt3/tqt3-14.0.0.spec |
||
diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec index 36bed42..14bde66 100644 --- a/redhat/dependencies/akode/akode-14.0.0.spec +++ b/redhat/dependencies/akode/akode-14.0.0.spec @@ -116,7 +116,13 @@ BuildRequires: libmad-devel %endif +# ALSA support +%if 0%{?suse_version} +BuildRequires: alsa-devel +%else BuildRequires: alsa-lib-devel +%endif + BuildRequires: libvorbis-devel BuildRequires: speex-devel diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 9f216c8..b4923bc 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec ** Diff limit reached (max: 250 lines) ** |
||
16248b3e | 2017-06-24 13:56:09 | François Andriot |
RPM: keep both automake and cmake spec files for tdemultimedia (automake still needed for 14.0.4) |
||
A redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec M redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec |
||
** Diff limit reached (max: 250 lines) ** |
||
381e1237 | 2017-06-24 13:57:05 | François Andriot |
RPM: update build scripts |
||
M redhat/build/build_rpm_package.sh M redhat/build/get_rpm_package_name.sh |
||
** Diff limit reached (max: 250 lines) ** |