diff options
Diffstat (limited to 'redhat/core')
| -rw-r--r-- | redhat/core/tde-i18n/tde-i18n.spec | 2 | ||||
| -rw-r--r-- | redhat/core/tdeaccessibility/tdeaccessibility.spec | 18 | ||||
| -rw-r--r-- | redhat/core/tdeaddons/tdeaddons.spec | 24 | ||||
| -rw-r--r-- | redhat/core/tdeadmin/tdeadmin.spec | 12 | ||||
| -rw-r--r-- | redhat/core/tdeartwork/tdeartwork.spec | 14 | ||||
| -rw-r--r-- | redhat/core/tdebase/pamd.tde.omv5000 | 10 | ||||
| -rw-r--r-- | redhat/core/tdebase/tdebase.spec | 121 | ||||
| -rw-r--r-- | redhat/core/tdebindings/tdebindings.spec | 24 | ||||
| -rw-r--r-- | redhat/core/tdeedu/tdeedu.spec | 10 | ||||
| -rw-r--r-- | redhat/core/tdegames/tdegames.spec | 17 | ||||
| -rw-r--r-- | redhat/core/tdegraphics/tdegraphics.spec | 48 | ||||
| -rw-r--r-- | redhat/core/tdelibs/tdelibs.spec | 76 | ||||
| -rw-r--r-- | redhat/core/tdemultimedia/tdemultimedia.spec | 55 | ||||
| -rw-r--r-- | redhat/core/tdenetwork/tdenetwork.spec | 38 | ||||
| -rw-r--r-- | redhat/core/tdepim/tdepim.spec | 42 | ||||
| -rw-r--r-- | redhat/core/tdesdk/tdesdk.spec | 21 | ||||
| -rw-r--r-- | redhat/core/tdetoys/tdetoys.spec | 10 | ||||
| -rw-r--r-- | redhat/core/tdeutils/tdeutils.spec | 10 | ||||
| -rw-r--r-- | redhat/core/tdevelop/tdevelop.spec | 16 | ||||
| -rw-r--r-- | redhat/core/tdewebdev/tdewebdev.spec | 11 |
20 files changed, 498 insertions, 81 deletions
diff --git a/redhat/core/tde-i18n/tde-i18n.spec b/redhat/core/tde-i18n/tde-i18n.spec index ee5d67c36..34bbf3a4b 100644 --- a/redhat/core/tde-i18n/tde-i18n.spec +++ b/redhat/core/tde-i18n/tde-i18n.spec @@ -1432,7 +1432,7 @@ for l in %{TDE_LANGS}; do ln -s ../cmake cmake fi - if ! rpm -E %%cmake|grep -q "cd build"; then + if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeaccessibility/tdeaccessibility.spec b/redhat/core/tdeaccessibility/tdeaccessibility.spec index 3b94e5e8c..35b6e2804 100644 --- a/redhat/core/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/core/tdeaccessibility/tdeaccessibility.spec @@ -95,11 +95,23 @@ BuildRequires: trinity-akode-devel %endif # ALSA support -BuildRequires: alsa-lib-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # GLIB2 support BuildRequires: glib2-devel +# JPEG support +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel + # XCB support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} BuildRequires: libxcb-devel @@ -401,7 +413,7 @@ Summary: Development files for tdeaccessibility Group: Development/Libraries/X11 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} -Requires: libjpeg-devel +Requires: %{libjpeg}-devel Requires: libpng-devel Obsoletes: trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release} @@ -439,7 +451,7 @@ unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec index 36925eb80..51c543109 100644 --- a/redhat/core/tdeaddons/tdeaddons.spec +++ b/redhat/core/tdeaddons/tdeaddons.spec @@ -87,13 +87,25 @@ BuildRequires: brp-check-trinity %endif # SDL support -BuildRequires: SDL-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}SDL-devel +%else +BuildRequires: SDL-devel +%endif -# ALSA support +# ALSA supportl +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else BuildRequires: alsa-lib-devel +%endif # OPENSSL support -BuildRequires: openssl-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else +BuildRequires: openssl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -112,7 +124,11 @@ BuildRequires: pcre-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # DB4/DB5 support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} @@ -692,7 +708,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeadmin/tdeadmin.spec b/redhat/core/tdeadmin/tdeadmin.spec index 5313d1037..322b8e869 100644 --- a/redhat/core/tdeadmin/tdeadmin.spec +++ b/redhat/core/tdeadmin/tdeadmin.spec @@ -88,13 +88,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # RPM support BuildRequires: rpm-devel @@ -351,7 +359,7 @@ touch /etc/lilo.conf unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -387,7 +395,7 @@ fi -DBUILD_SECPOLICY=ON \ -DBUILD_TDEFILE_PLUGINS=ON \ \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 -DKU_FIRSTUID="1000" \ -DKU_FIRSTGID="1000" \ %endif diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index ed79cb7f0..ab1e7c3cb 100644 --- a/redhat/core/tdeartwork/tdeartwork.spec +++ b/redhat/core/tdeartwork/tdeartwork.spec @@ -78,7 +78,11 @@ BuildRequires: libidn-devel #BuildRequires: esound-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -86,8 +90,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -172,7 +180,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # Metapackage @@ -740,7 +752,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdebase/pamd.tde.omv5000 b/redhat/core/tdebase/pamd.tde.omv5000 new file mode 100644 index 000000000..9e0557414 --- /dev/null +++ b/redhat/core/tdebase/pamd.tde.omv5000 @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth required pam_env.so +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin +auth include system-auth +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session required pam_namespace.so +session include system-auth +session required pam_loginuid.so diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index dc1cdf422..463576b35 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -63,10 +63,14 @@ Source1: %{name}-rpmlintrc # Pam configuration files for RHEL / Fedora %if 0%{?suse_version} == 0 -Source2: pamd.kdm-trinity%{?dist} -Source3: pamd.kdm-trinity-np%{?dist} -Source4: pamd.kcheckpass-trinity%{?dist} -Source5: pamd.kscreensaver-trinity%{?dist} +%if 0%{?mdkver} +Source2: pamd.tde.omv5000 +%else +Source2: pamd.kdm-trinity%{?pamd_suffix} +Source3: pamd.kdm-trinity-np%{?pamd_suffix} +Source4: pamd.kcheckpass-trinity%{?pamd_suffix} +Source5: pamd.kscreensaver-trinity%{?pamd_suffix} +%endif %endif # openSUSE: configuration file for TDM @@ -187,6 +191,12 @@ Requires: mandriva-theme %define tde_starticon /usr/share/icons/mandriva.png %endif +# OpenMandriva +%if 0%{?mdkver} +Requires: distro-release-theme +%define tde_bg /usr/share/wallpapers/default.png +%endif + # PCLINUXOS %if 0%{?pclinuxos} Requires: desktop-common-data @@ -221,19 +231,36 @@ BuildRequires: fdupes BuildRequires: htdig # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # AUDIOFILE support BuildRequires: audiofile-devel # ALSA supportl -BuildRequires: alsa-lib-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # RAW1394 support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}raw1394-devel +%else BuildRequires: libraw1394-devel +%endif # VORBIS support -BuildRequires: libvorbis-devel +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} # GLIB2 support BuildRequires: glib2-devel @@ -242,9 +269,13 @@ BuildRequires: glib2-devel BuildRequires: pcre-devel # SASL support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}sasl-devel +%else BuildRequires: %{_lib}sasl2-devel %endif +%endif %if 0%{?suse_version} BuildRequires: cyrus-sasl-devel %endif @@ -283,8 +314,12 @@ BuildRequires: gamin-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -306,13 +341,21 @@ BuildRequires: libsensors4-devel %if 0%{?suse_version} >= 1310 BuildRequires: udev %endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel +%endif %define with_tsak 1 %define with_tdehwlib 1 %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # XRANDR support # On RHEL5, xrandr library is too old. @@ -337,8 +380,12 @@ BuildRequires: hal-devel >= 0.5 # Disabled on RHEL4 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_exr 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel %endif +%endif # XSCREENSAVER support # RHEL 4: disabled @@ -396,8 +443,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -428,8 +479,12 @@ BuildRequires: libart_lgpl-devel BuildRequires: samba-common %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?mdkver} +BuildRequires: %{_lib}smbclient-devel +%else BuildRequires: libsmbclient-devel %endif +%endif # IMAKE %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 @@ -441,8 +496,12 @@ BuildRequires: imake BuildRequires: xorg-x11-libxkbfile-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xkbfile-devel +%else BuildRequires: libxkbfile-devel -%if 0%{?fedora} || 0%{?rhel} >= 7 +%endif +%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7 BuildRequires: xkeyboard-config-devel %endif %endif @@ -517,16 +576,22 @@ BuildRequires: font-util BuildRequires: bdftopcf %endif +%if 0%{?mdkver} == 0 %if 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: drakconf %endif +%endif # LIBCONFIG support # Needed for "compton" stuff %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} %define with_libconfig 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}config-devel +%else BuildRequires: libconfig-devel %endif +%endif # KBDLEDSYNC support %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} @@ -556,7 +621,12 @@ BuildRequires: libnsl-devel %endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # SELINUX support %if 0%{?rhel} >= 6 || 0%{?fedora} @@ -2113,10 +2183,10 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/ %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 +%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 +%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version} %{_datadir}/xsessions/tde.desktop %endif @@ -2613,8 +2683,10 @@ ever launching another application. %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop +%if 0%{?mdkver} == 0 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase +%endif %{tde_datadir}/apps/konqueror/tiles/ %{tde_datadir}/autostart/konqy_preload.desktop %{tde_datadir}/config.kcfg/keditbookmarks.kcfg @@ -2633,6 +2705,8 @@ ever launching another application. %{tde_mandir}/man1/kfmclient.1* %{tde_mandir}/man1/konqueror.1* +%if 0%{?mdkver} == 0 + %post -n trinity-konqueror if [ $1 -eq 1 ]; then update-alternatives --install \ @@ -2649,6 +2723,8 @@ if [ $1 -eq 0 ]; then %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || : fi +%endif + ########## %package -n trinity-konqueror-devel @@ -2830,8 +2906,10 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess %postun -n trinity-ksmserver %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} == 0 fndSession %endif +%endif # openSUSE 15.0 alternatives %if 0%{?suse_version} >= 1500 @@ -3257,7 +3335,7 @@ if [ -d "/usr/include/tirpc" ]; then RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -3329,7 +3407,7 @@ fi %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver} -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ %endif .. @@ -3348,7 +3426,7 @@ fi # Adds a GDM/KDM/XDM session called 'TDE' # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'. -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkver} || 0%{?mgaversion} >= 6 %__install -D -m 644 \ "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" @@ -3378,24 +3456,29 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k" %else %if 0%{?mgaversion} >= 6 FNDSESSION_EXEC="/usr/sbin/chksession -l" -%else -FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" -%endif %endif EOF %endif +%endif # PAM configuration files (except openSUSE) %if 0%{?suse_version} == 0 +%if 0%{?mdkver} +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" +%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" +%else %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" %endif +%endif # TDM configuration %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver} -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3410,11 +3493,13 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" fi +%if 0%{?mdkver} == 0 # Makes 'media_safelyremove.desktop' an alternative. # This allows the use of 'tdeio-umountwrapper' package. %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" %__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives" %__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop" +%endif # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 6ac12ae8a..f194d330e 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -107,8 +107,12 @@ Requires: evolution28-pango BuildRequires: evolution28-atk-devel Requires: evolution28-atk %else +%if 0%{?mdkver} +BuildRequires: %{_lib}gtk+2.0-devel +%else BuildRequires: gtk2-devel %endif +%endif # XULRUNNER support %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 @@ -119,7 +123,11 @@ BuildRequires: mozilla-xulrunner20-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # GTK1 support %if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) @@ -161,8 +169,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -185,13 +197,13 @@ BuildRequires: rubypick %endif # Check for Ruby library directory -%if "%{?ruby_libarchdir}" != "" +%if "%{?ruby_libarchdir}" != "" && "%{?ruby_libarchdir}" != "%{_libdir}/%{name}" %define ruby_arch %{?ruby_libarchdir} %else %if "%{?rb_archdir}" != "" %define ruby_arch %{?rb_archdir} %else -%if "%{%ruby_archdir}" != "" +%if "%{?ruby_archdir}" != "" %define ruby_arch %{?ruby_archdir} %else %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')} @@ -686,7 +698,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{python_sitearch}/pcop.la %{python_sitearch}/pcop.so -%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} +%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version} %{python_sitearch}/pydcop.py* %if 0%{?rhel} == 7 %{python_sitearch}/__pycache__/pydcop.*.pyc @@ -1076,6 +1088,10 @@ exit 2 exit 3 %endif +%if 0%{?mdkver} +touch config.h.in +%endif + # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \ @@ -1102,7 +1118,7 @@ exit 3 %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index 78632f02a..7cb4d8318 100644 --- a/redhat/core/tdeedu/tdeedu.spec +++ b/redhat/core/tdeedu/tdeedu.spec @@ -81,13 +81,21 @@ BuildRequires: fdupes BuildRequires: doxygen # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # LIBUSB support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} @@ -1157,7 +1165,7 @@ sed -i "kig/pykig/pykig.py" \ export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdegames/tdegames.spec b/redhat/core/tdegames/tdegames.spec index 7de95211b..26bb8d057 100644 --- a/redhat/core/tdegames/tdegames.spec +++ b/redhat/core/tdegames/tdegames.spec @@ -97,13 +97,26 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # SUSE desktop files utility %if 0%{?suse_version} @@ -1183,7 +1196,7 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec index 720ff20a1..a67205930 100644 --- a/redhat/core/tdegraphics/tdegraphics.spec +++ b/redhat/core/tdegraphics/tdegraphics.spec @@ -95,29 +95,49 @@ BuildRequires: libusb-devel %endif # MNG support +%if 0%{?mdkver} +BuildRequires: %{_lib}mng-devel +%else BuildRequires: libmng-devel +%endif # TIFF support -BuildRequires: libtiff-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else +BuildRequires: libtiff-devel +%endif # PCRE support BuildRequires: pcre-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # GIF support %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8 BuildRequires: giflib-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}gif-devel +%else BuildRequires: libungif-devel %endif +%endif # GPHOTO2 support -%if 0%{?suse_version} -BuildRequires: libgphoto2-devel +%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gphoto-devel %else -BuildRequires: gphoto2-devel +BuildRequires: gphoto2-devel +%endif +%else +BuildRequires: libgphoto2-devel %endif # PAPER support @@ -169,7 +189,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -181,8 +201,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -195,11 +219,19 @@ BuildRequires: xorg-x11-Mesa-libGLU %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}drm-devel +%else BuildRequires: libdrm-devel %endif +%endif # OPENEXR support +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel +%endif # POPPLER support %define with_pdf 1 @@ -231,7 +263,11 @@ BuildRequires: lcms-devel BuildRequires: fribidi-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # kamera %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} @@ -1058,7 +1094,7 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec index 8c4c51c92..df2eaf1d3 100644 --- a/redhat/core/tdelibs/tdelibs.spec +++ b/redhat/core/tdelibs/tdelibs.spec @@ -105,25 +105,49 @@ BuildRequires: brp-check-trinity BuildRequires: krb5-devel # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif # ALSA support -BuildRequires: alsa-lib-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif # IDN support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}idn-devel +%else BuildRequires: libidn-devel +%endif # CUPS support BuildRequires: cups-devel # TIFF support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # GLIB2 support BuildRequires: glib2-devel @@ -218,7 +242,12 @@ Requires: avahi # OPENEXR support %if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_openexr 1 +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel +%endif + %if 0%{?pclinuxos} BuildRequires: libpthread-stubs %endif @@ -282,8 +311,8 @@ Requires: ca-certificates %define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt %endif %endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} +%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver} Requires: rootcerts %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %else @@ -328,16 +357,20 @@ Requires: %{cacert} %define xt_devel libXt-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define xt_devel libxt-devel +%define xt_devel %{_lib}xt-devel %endif %{?xt_devel:BuildRequires: %{xt_devel}} ### New features in TDE R14 # LIBMAGIC support +%if 0%{?mdkver} +BuildRequires: %{_lib}magic-devel +%else %if 0%{?rhel} != 5 BuildRequires: file-devel %endif +%endif # NETWORKMANAGER support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} @@ -362,8 +395,12 @@ BuildRequires: NetworkManager-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # HAL support %if 0%{?rhel} == 5 @@ -383,15 +420,23 @@ Requires: udisks %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 %define with_udisks2 1 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -BuildRequires: libudisks2-devel -%else +%define udisks2 udisks2 +%define udisks2_devel libudisks2-devel +%endif %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 -BuildRequires: libudisks2-0-devel -%else -BuildRequires: udisks2-devel +%define udisks2 udisks2 +%define udisks2_devel libudisks2-0-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +%define udisks2 udisks2 +%define udisks2_devel udisks2-devel %endif +%if 0%{?mdkver} +%define udisks2 udisks +%define udisks2_devel %{_lib}udisks-devel %endif -Requires: udisks2 +Requires: %{udisks2} +BuildRequires: %{udisks2_devel} %endif # DEVICEKIT POWER support @@ -449,7 +494,12 @@ BuildRequires: libr-devel >= 0.6.0 %endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} # INTLTOOL support BuildRequires: intltool @@ -599,7 +649,7 @@ Requires: libtqt3-mt-devel >= 3.5.0 Requires: libtqt4-devel = %{tde_epoch}:4.2.0 Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: libart_lgpl-devel -Requires: libattr-devel +Requires: %{libattr_devel} Requires: intltool %{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xt_devel:Requires: %{xt_devel}} @@ -653,7 +703,7 @@ fi export TDEDIR="%{tde_prefix}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdemultimedia/tdemultimedia.spec b/redhat/core/tdemultimedia/tdemultimedia.spec index 1613dd6a6..4aa7a0d1a 100644 --- a/redhat/core/tdemultimedia/tdemultimedia.spec +++ b/redhat/core/tdemultimedia/tdemultimedia.spec @@ -111,17 +111,40 @@ BuildRequires: zlib-devel #BuildRequires: libmusicbrainz-devel libtunepimp-devel # Audio libraries -BuildRequires: libvorbis-devel BuildRequires: audiofile-devel -BuildRequires: libtheora-devel -BuildRequires: alsa-lib-devel BuildRequires: cdparanoia #BuildRequires: libmpg123-devel +# VORBIS support +%if 0%{?mdkver} || 0%{?mgaversion} +%define libvorbis_devel %{_lib}vorbis-devel +%else +%define libvorbis_devel libvorbis-devel +%endif +BuildRequires: %{libvorbis_devel} + +# THEORA +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}theora-devel +%else +BuildRequires: libtheora-devel +%endif + +# ALSA support +%if 0%{?mdkver} +BuildRequires: %{_lib}asound-devel +%else +BuildRequires: alsa-lib-devel +%endif + # CDDA support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}cdda-devel +%else BuildRequires: libcdda-devel %endif +%endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: cdparanoia-devel %endif @@ -144,9 +167,14 @@ BuildRequires: flac-devel # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gstreamer-devel +BuildRequires: %{_lib}gst-plugins-base1.0-devel +%else BuildRequires: %{_lib}gstreamer1.0-devel BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel %endif +%endif %if 0%{?rhel} == 4 BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-devel @@ -182,8 +210,12 @@ BuildRequires: libXxf86vm-devel %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}xine-devel +%else BuildRequires: %{_lib}xine1.2-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: xine-lib-devel %endif @@ -216,13 +248,26 @@ BuildRequires: libmp3lame-devel BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # ATTR support -BuildRequires: libattr-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +%define libattr_devel %{_lib}attr-devel +%else +%define libattr_devel libattr-devel +%endif +BuildRequires: %{libattr_devel} %if 0%{?fedora} || 0%{?rhel} BuildRequires: lame-devel @@ -1073,7 +1118,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdenetwork/tdenetwork.spec b/redhat/core/tdenetwork/tdenetwork.spec index e42d500e0..0a6e431ca 100644 --- a/redhat/core/tdenetwork/tdenetwork.spec +++ b/redhat/core/tdenetwork/tdenetwork.spec @@ -114,7 +114,11 @@ Requires: avahi %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # TLS support BuildRequires: gnutls-devel @@ -129,8 +133,12 @@ BuildRequires: sqlite-devel # GADU support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_gadu 1 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}gadu-devel +%else BuildRequires: libgadu-devel %endif +%endif # PCRE support BuildRequires: pcre-devel @@ -158,7 +166,7 @@ BuildRequires: xorg-x11-libXmu-devel BuildRequires: libXmu-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel +BuildRequires: %{_lib}xmu-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel @@ -177,18 +185,24 @@ BuildRequires: libXxf86vm-devel #define _with_xmms --with-xmms # Wifi support -%define with_wifi 1 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -BuildRequires: wireless-tools-devel +%define wifi_devel wireless-tools-devel %endif %if 0%{?mgaversion} == 2 || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel +%define wifi_devel %{_lib}iw29-devel %endif %if 0%{?rhel} == 5 || 0%{?suse_version} -BuildRequires: wireless-tools +%define wifi_devel wireless-tools %endif %if 0%{?suse_version} || 0%{?mgaversion} >= 3 -BuildRequires: libiw-devel +%define wifi_devel libiw-devel +%endif +%if 0%{?mdkver} +%define wifi_devel %nil +%endif +%if "%{wifi_devel}" != "" +%define with_wifi 1 +BuildRequires: %{wifi_devel} %endif # OpenSLP support @@ -217,7 +231,13 @@ BuildRequires: kernel-headers # XML support BuildRequires: libxml2-devel + +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif #jabber BuildRequires: libidn-devel @@ -234,7 +254,11 @@ BuildRequires: speex-devel #Requires: jasper # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # MEANWHILE support %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version} @@ -1100,7 +1124,7 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec index 3725b16d8..de1c98944 100644 --- a/redhat/core/tdepim/tdepim.spec +++ b/redhat/core/tdepim/tdepim.spec @@ -75,15 +75,38 @@ BuildRequires: desktop-file-utils BuildRequires: make BuildRequires: gpgme-devel -BuildRequires: libgpg-error-devel BuildRequires: flex -BuildRequires: libical-devel BuildRequires: boost-devel BuildRequires: pcre-devel BuildRequires: libidn-devel +# ICAL support +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}ical-devel +%else +BuildRequires: libical-devel +%endif + +# GPG-ERROR support +%if 0%{?mdkver} +BuildRequires: %{_lib}gpg-error-devel +%else +BuildRequires: libgpg-error-devel +%endif + # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif + +# ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else +BuildRequires: libacl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -126,8 +149,12 @@ BuildRequires: curl-devel BuildRequires: glib2-devel # SASL support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}sasl-devel +%else BuildRequires: %{_lib}sasl2-devel +%endif %else BuildRequires: cyrus-sasl-devel %endif @@ -187,9 +214,6 @@ BuildRequires: xscreensaver-gl %endif %endif -# ACL support -BuildRequires: libacl-devel - Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} @@ -835,8 +859,12 @@ Requires: gnupg2 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} Requires: pinentry +%if 0%{?mdkver} +Requires: gnupg +%else Requires: dirmngr %endif +%endif %description -n trinity-kleopatra Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm @@ -1845,7 +1873,7 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdesdk/tdesdk.spec b/redhat/core/tdesdk/tdesdk.spec index 52ad08ad5..8d1ac42b6 100644 --- a/redhat/core/tdesdk/tdesdk.spec +++ b/redhat/core/tdesdk/tdesdk.spec @@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -117,12 +121,21 @@ BuildRequires: libdb-4_8-devel # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex +%if 0%{?mdkver} +BuildRequires: flex-devel +%endif # umbrello -BuildRequires: libxslt-devel BuildRequires: libxml2-devel BuildRequires: subversion-devel BuildRequires: neon-devel +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else +BuildRequires: libxslt-devel +%endif + # PERL support BuildRequires: perl %if 0%{?fedora} >= 19 @@ -130,7 +143,11 @@ BuildRequires: perl-podlators %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8 @@ -1092,7 +1109,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdetoys/tdetoys.spec b/redhat/core/tdetoys/tdetoys.spec index afff11469..48cf7218a 100644 --- a/redhat/core/tdetoys/tdetoys.spec +++ b/redhat/core/tdetoys/tdetoys.spec @@ -93,13 +93,21 @@ BuildRequires: gamin-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # PCRE support BuildRequires: pcre-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release} @@ -399,7 +407,7 @@ This package is part of Trinity, and a component of the TDE toys module. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index b288ac099..cd0c99dd7 100644 --- a/redhat/core/tdeutils/tdeutils.spec +++ b/redhat/core/tdeutils/tdeutils.spec @@ -141,7 +141,11 @@ BuildRequires: pcre-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # XSCREENSAVER support # RHEL 8: available in EPEL @@ -161,7 +165,11 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # CONSOLEHELPER (usermode) support %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} @@ -897,7 +905,7 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index bb060e8af..3f718693b 100644 --- a/redhat/core/tdevelop/tdevelop.spec +++ b/redhat/core/tdevelop/tdevelop.spec @@ -137,8 +137,12 @@ BuildRequires: neon-devel # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -148,11 +152,20 @@ BuildRequires: openldap24-libs-devel # LIBACL support %if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +# ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel %endif +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %global python python3 @@ -517,7 +530,6 @@ individual needs. %{tde_libdir}/libkinterfacedesigner.so.0.0.0 %{tde_tdelibdir}/libkdevvisualboyadvance.la %{tde_tdelibdir}/libkdevvisualboyadvance.so -%{tde_datadir}/apps/kdevdesignerpart/pics/ %{tde_datadir}/apps/kdevvisualboyadvance/ %{tde_tdedocdir}/HTML/en/tde_app_devel/ %{tde_datadir}/mimelnk/text/x-fortran.desktop @@ -622,7 +634,7 @@ if [ -d "/usr/include/openldap24" ]; then fi -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index 1b4b0b0a6..d0ce64cce 100644 --- a/redhat/core/tdewebdev/tdewebdev.spec +++ b/redhat/core/tdewebdev/tdewebdev.spec @@ -82,7 +82,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) @@ -99,7 +104,11 @@ BuildRequires: libxml2-devel #endif # ICU support +%if 0%{?mdkver} +BuildRequires: %{_lib}icu-devel +%else BuildRequires: libicu-devel +%endif # Readline support BuildRequires: readline-devel @@ -458,7 +467,7 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release} unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi |