TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM: more updates for centos5

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/87/head
François Andriot 4 years ago
parent d79b34324d
commit 227df16374
7 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
redhat/Makefile
Unescape View File

@ -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)

9
redhat/applications/tork/tork.spec
Unescape View File

@ -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

13
redhat/docker/el5/Dockerfile.i686
Unescape View File

@ -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

13
redhat/docker/el5/Dockerfile.x86_64
Unescape View File

@ -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

12
redhat/extras/fileshareset/fileshareset.spec
Unescape View File

@ -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

2
redhat/extras/trinity-desktop/trinity-desktop.spec
Unescape View File

@ -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

2
redhat/main/tdelibs/tdelibs.spec
Unescape View File

@ -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}

Write Preview
Loading…
Cancel
Save