From 227df1637413f7cc7d7fc995c2e293f1fa2029a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 28 May 2021 20:18:46 +0200 Subject: [PATCH] RPM: more updates for centos5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/Makefile | 2 ++ redhat/applications/tork/tork.spec | 9 +++++++++ redhat/docker/el5/Dockerfile.i686 | 13 ------------- redhat/docker/el5/Dockerfile.x86_64 | 13 ------------- redhat/extras/fileshareset/fileshareset.spec | 12 ++++++++---- redhat/extras/trinity-desktop/trinity-desktop.spec | 2 ++ redhat/main/tdelibs/tdelibs.spec | 2 ++ 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/redhat/Makefile b/redhat/Makefile index 9d06c5fb5..a90f04b34 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -429,7 +429,9 @@ kpicosim: tdebase $(call buildpkg,applications/kpicosim) kpilot: tdebase tdepim +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kpilot) +endif kpowersave: tdebase $(call buildpkg,applications/kpowersave) diff --git a/redhat/applications/tork/tork.spec b/redhat/applications/tork/tork.spec index 37767a993..940fb8e98 100644 --- a/redhat/applications/tork/tork.spec +++ b/redhat/applications/tork/tork.spec @@ -82,6 +82,15 @@ BuildRequires: torsocks # OPENSSL support BuildRequires: openssl-devel +# GEOIP +%if 0%{?suse_version} +%if 0%{?suse_version} < 1550 +BuildRequires: libGeoIP-devel +%endif +%else +BuildRequires: geoip-devel +%endif + %description TorK is an Anonymity Manager for the TDE Desktop. Browse anonymously on diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index f9f9a3af6..a16417a58 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -55,13 +55,6 @@ RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/binutils-2 && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm \ && rm -fv /tmp/*.src.rpm -# Build dependencies -RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \ - && rpm -ivh --nomd5 /tmp/file-5.04-30.el6.src.rpm \ - && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm \ - && rm -fv /tmp/*.src.rpm - RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \ && rpm -ivh --nomd5 /tmp/pcsc-perl-1.4.14-2.el6.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ @@ -108,9 +101,3 @@ RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1 && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm \ && rm -fv /tmp/*.src.rpm - -RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \ - && rpm -ivh --nomd5 /tmp/pilot-link-0.12.4-6.el6.src.rpm \ - && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm \ - && rm -fv /tmp/*.src.rpm diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 9c96b1ead..a6033ebea 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -55,13 +55,6 @@ RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/binutils-2 && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm \ && rm -fv /tmp/*.src.rpm -# Build dependencies -RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \ - && rpm -ivh --nomd5 /tmp/file-5.04-30.el6.src.rpm \ - && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm \ - && rm -fv /tmp/*.src.rpm - RUN wget -nv -P /tmp http://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \ && rpm -ivh --nomd5 /tmp/pcsc-perl-1.4.14-2.el6.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ @@ -108,9 +101,3 @@ RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1 && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm \ && rm -fv /tmp/*.src.rpm - -RUN wget -nv -P /tmp http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \ - && rpm -ivh --nomd5 /tmp/pilot-link-0.12.4-6.el6.src.rpm \ - && setarch ${ARCH} rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \ - && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm \ - && rm -fv /tmp/*.src.rpm diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index 3c7745b27..f445562fc 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -95,6 +95,10 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf" # Remove setuid bit on some binaries. chmod 0755 "%{?buildroot}%{_bindir}/fileshareset" +# Rename binary to avoid conflict with kde3 +mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2" + + %clean %__rm -rf $RPM_BUILD_ROOT @@ -103,7 +107,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset" %post %if 0%{?suse_version} # Sets permissions on setuid files (openSUSE specific) -%set_permissions %{_bindir}/fileshareset +%set_permissions %{_bindir}/fileshareset2 %endif @@ -115,16 +119,16 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset" # Setuid program %if 0%{?suse_version} -%verify(not mode) %{_bindir}/fileshareset +%verify(not mode) %{_bindir}/fileshareset2 %else -%attr(4755,root,root) %{_bindir}/fileshareset +%attr(4755,root,root) %{_bindir}/fileshareset2 %endif %if 0%{?suse_version} # Check permissions on setuid files (openSUSE specific) %verifyscript -%verify_permissions -e /usr/bin/fileshareset +%verify_permissions -e %{_bindir}/fileshareset2 %endif diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 6a09c0fa7..7cf29ecb0 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -165,7 +165,9 @@ Requires: trinity-konversation Requires: trinity-kooldock Requires: trinity-kopete-otr Requires: trinity-kpicosim +%if 0%{?rhel} != 5 Requires: trinity-kpilot +%endif #Requires: trinity-kplayer Requires: trinity-krecipes Requires: trinity-krename diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index d7beb44fb..5f9f70832 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -329,7 +329,9 @@ Requires: %{cacert} ### New features in TDE R14 # LIBMAGIC support +%if 0%{?rhel} != 5 BuildRequires: file-devel +%endif # NETWORKMANAGER support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}