diff options
author | François Andriot <albator78@libertysurf.fr> | 2024-05-09 20:50:37 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2024-05-09 20:50:37 +0200 |
commit | c6d21f1119dd7eb5a1395a8d4640f837223f1ea3 (patch) | |
tree | 214cd960ed83db6ae7931d46e7f883b966150e01 /redhat/extras | |
parent | 2af6f1823f0e7b5fd6bac85f95e0881ff7d41506 (diff) | |
download | tde-packaging-c6d21f1119dd7eb5a1395a8d4640f837223f1ea3.tar.gz tde-packaging-c6d21f1119dd7eb5a1395a8d4640f837223f1ea3.zip |
RPM: initial support for OpenMandriva
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/extras')
-rw-r--r-- | redhat/extras/fileshareset/fileshareset.spec | 4 | ||||
-rw-r--r-- | redhat/extras/htdig/htdig.spec | 13 | ||||
-rw-r--r-- | redhat/extras/pinentry-tqt/pinentry-tqt.spec | 6 | ||||
-rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem.spec | 1 |
4 files changed, 19 insertions, 5 deletions
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index 2470b3412..a03d6bd5f 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -67,7 +67,7 @@ This utility was originally written for openSUSE KDE3. %prep %setup -q -n fileshareset2 -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "." || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "." || %__cp -f "/usr/share/libtool/ltmain.sh" "." aclocal autoconf automake -a -c @@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset" # Rename binary to avoid conflict with kde3 mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2" -ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist" +ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist" %clean diff --git a/redhat/extras/htdig/htdig.spec b/redhat/extras/htdig/htdig.spec index 930dde7be..f1a779fc9 100644 --- a/redhat/extras/htdig/htdig.spec +++ b/redhat/extras/htdig/htdig.spec @@ -1,6 +1,12 @@ %define _disable_ld_as_needed 1 %define _disable_ld_no_undefined 1 +%if 0%{?mdkver} >= 5000000 +%global __cc /usr/bin/gcc +%global __cxx /usr/bin/g++ +%global prefer_gcc 1 +%endif + %define contentdir /var/www Summary: A web indexing and searching system for a small domain or intranet @@ -26,6 +32,9 @@ BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-buildroot +Provides: group(htdig) +Provides: user(htdig) + %description The ht://Dig system is a complete world wide web indexing and searching system for a small domain or intranet. This system is not meant to replace the need @@ -105,10 +114,10 @@ Libraries needed to develop for htdig. %defattr(-,root,root) %doc ChangeLog %doc htdoc/* -%{_libdir}/htdig/*.a +#%{_libdir}/htdig/*.a %{_libdir}/htdig/*.la %{_libdir}/htdig/*[a-z].so -%{_libdir}/htdig_db/*.a +#%{_libdir}/htdig_db/*.a %{_libdir}/htdig_db/*.la %{_libdir}/htdig_db/*[a-z].so %{_includedir}/* diff --git a/redhat/extras/pinentry-tqt/pinentry-tqt.spec b/redhat/extras/pinentry-tqt/pinentry-tqt.spec index 4dcf1907c..35f83a72e 100644 --- a/redhat/extras/pinentry-tqt/pinentry-tqt.spec +++ b/redhat/extras/pinentry-tqt/pinentry-tqt.spec @@ -45,7 +45,13 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: pkgconfig BuildRequires: libassuan-devel + +# SECRET support +%if 0%{?mdkver} >= 5000000 +BuildRequires: %{_lib}secret-devel +%else BuildRequires: libsecret-devel +%endif Requires: pinentry diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index f78072768..e6fccabdb 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -65,7 +65,6 @@ This package installs the Trinity directory structure. %dir %{tde_bindir} %dir %{tde_datadir} -%dir %{tde_confdir} %dir %{tde_confdir}/magic %dir %{tde_docdir} |