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

RPM: various updates for TDE 14.0.12

Browse Source 
Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/158/head
François Andriot 3 years ago
parent 2b75ee2747
commit bd0c60ec54
16 changed files with 56 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
redhat/applications/koffice/koffice.spec
Unescape View File

@ -243,7 +243,11 @@ BuildRequires: wv2-devel
# MESA support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 8
BuildRequires: %{_lib}mesagl-devel
%else
BuildRequires: %{_lib}mesagl1-devel
%endif
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?fedora} || 0%{?rhel}

4
redhat/applications/kxmleditor/kxmleditor.spec
Unescape View File

@ -131,10 +131,6 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{tde_pkg}
# Move desktop icon to correct location
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}"
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "XML Editor" -r "%{tde_pkg}" Utility Editor

34
redhat/common/cmake/cmake.spec
Unescape View File

@ -21,6 +21,12 @@
%endif
%define tde_pkg cmake
%if 0%{?rhel} == 7
%define cmake_datadir %{_datadir}/cmake3
%else
%define cmake_datadir %{_datadir}/cmake
%endif
Name: trinity-%{tde_pkg}
Version: %{tde_version}
@ -93,20 +99,20 @@ fi
%files
%defattr(-,root,root,-)
%{_datadir}/cmake/Modules/FindTDE.cmake
%{_datadir}/cmake/Modules/FindTQt.cmake
%{_datadir}/cmake/Modules/FindTQtQUI.cmake
%{_datadir}/cmake/Modules/TDEL10n.cmake
%{_datadir}/cmake/Modules/TDEMacros.cmake
%{_datadir}/cmake/Modules/TDESetupPaths.cmake
%{_datadir}/cmake/Modules/tde_automoc.cmake
%{_datadir}/cmake/Modules/tde_l10n_merge.pl
%{_datadir}/cmake/Modules/tde_uic.cmake
%{_datadir}/cmake/Templates/tde_dummy_cpp.cmake
%{_datadir}/cmake/Templates/tde_export_library.cmake
%{_datadir}/cmake/Templates/tde_libtool_file.cmake
%{_datadir}/cmake/Templates/tde_tdeinit_executable.cmake
%{_datadir}/cmake/Templates/tde_tdeinit_module.cmake
%{cmake_datadir}/Modules/FindTDE.cmake
%{cmake_datadir}/Modules/FindTQt.cmake
%{cmake_datadir}/Modules/FindTQtQUI.cmake
%{cmake_datadir}/Modules/TDEL10n.cmake
%{cmake_datadir}/Modules/TDEMacros.cmake
%{cmake_datadir}/Modules/TDESetupPaths.cmake
%{cmake_datadir}/Modules/tde_automoc.cmake
%{cmake_datadir}/Modules/tde_l10n_merge.pl
%{cmake_datadir}/Modules/tde_uic.cmake
%{cmake_datadir}/Templates/tde_dummy_cpp.cmake
%{cmake_datadir}/Templates/tde_export_library.cmake
%{cmake_datadir}/Templates/tde_libtool_file.cmake
%{cmake_datadir}/Templates/tde_tdeinit_executable.cmake
%{cmake_datadir}/Templates/tde_tdeinit_module.cmake
%changelog

1
redhat/dependencies/polkit-tqt/polkit-tqt.spec
Unescape View File

@ -49,6 +49,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt4-devel
BuildRequires: trinity-cmake >= %{tde_version}
BuildRequires: trinity-dbus-1-tqt-devel
BuildRequires: trinity-filesystem >= %{tde_version}

14
redhat/dependencies/tqscintilla/tqscintilla.spec
Unescape View File

@ -137,11 +137,6 @@ This package contains the documentation for tqscintilla.
%files -n %{libtqscintilla}-doc
%defattr(-,root,root,-)
%{_docdir}/libtqscintilla7/
%exclude %{_docdir}/libtqscintilla7/ChangeLog
%exclude %{_docdir}/libtqscintilla7/LICENSE
%exclude %{_docdir}/libtqscintilla7/NEWS
%exclude %{_docdir}/libtqscintilla7/README
/usr/share/doc/libtqscintilla/
##########
@ -184,6 +179,15 @@ fi
%__rm -rf %{?buildroot}
%__make install -C build DESTDIR=%{?buildroot}
# Fix doc location
if [ -d %{?buildroot}%{_docdir}/lib64tqscintilla7 ]; then
%__mv -f %{?buildroot}%{_docdir}/lib64tqscintilla7 %{?buildroot}%{_docdir}/libtqscintilla7
fi
if [ -d %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 ]; then
%__mv -f %{?buildroot}%{_docdir}/libtqscintilla7-1.7.1 %{?buildroot}%{_docdir}/libtqscintilla7
fi
# Fix headers location
%__mv "%{?buildroot}%{_includedir}/tqt3" "%{?buildroot}%{_includedir}/tqscintilla"

1
redhat/docker/el6/Dockerfile.x86_64
Unescape View File

@ -12,6 +12,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
&& rpm -Uvh http://repo/repo/archives/centos/6/os/x86_64/Packages/wget-1.12-10.el6.x86_64.rpm \
&& rm -fv /etc/yum.repos.d/*.repo \
&& wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \
&& sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \
&& yum -y clean all \
&& yum -y update \
&& rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \

3
redhat/docker/el7/packages
Unescape View File

@ -10,6 +10,7 @@ bison
bluez-libs-devel
boost-devel
bzip2-devel
byacc
ccache
cdparanoia
cdparanoia-devel
@ -19,6 +20,7 @@ clamav
clamav-devel
clucene-core-devel
cmake
cmake3
cpp
cppunit-devel
createrepo
@ -174,6 +176,7 @@ pigz
pilot-link-devel
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
polkit-devel
poppler-devel
postgresql-devel
ppp

1
redhat/docker/el7/rpmmacros
Unescape View File

@ -1,3 +1,4 @@
%dist .el7
%_smp_mflags -j8
%jobs 8
%cmake %cmake3

2
redhat/docker/el8/Dockerfile.x86_64
Unescape View File

@ -1,4 +1,4 @@
FROM centos:8
FROM rockylinux:8
ARG TDE_VERSION=14.0.11
ARG ARCH=x86_64

2
redhat/docker/f35/packages
Unescape View File

@ -115,6 +115,7 @@ libofx-devel
libogg-devel
libotr-devel
libpaper-devel
libpqxx-devel
libqalculate-devel
libraw1394-devel
librsvg2
@ -187,6 +188,7 @@ perl(XML::Parser)
pilot-link-devel
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
polkit-devel
poppler-devel
postgresql
postgresql-devel

1
redhat/docker/mga8/packages.i686
Unescape View File

@ -213,6 +213,7 @@ pinentry-gtk2
pkgconfig(audiofile)
pkgconfig(libpng16)
polkit-agent-none
polkit-devel
postgresql13
postgresql13-devel
ppp

1
redhat/docker/mga8/packages.x86_64
Unescape View File

@ -216,6 +216,7 @@ pinentry-gtk2
pkgconfig(audiofile)
pkgconfig(libpng16)
polkit-agent-none
polkit-devel
postgresql13
postgresql13-devel
ppp

2
redhat/docker/oss153/packages
Unescape View File

@ -164,7 +164,9 @@ perl-PAR-Packer
perl-pcsc
pkcs11-helper-devel
pkgconfig(pygtk-2.0)
polkit-devel
postgresql10
postgresql10-devel
python-devel
python3-devel
python3-sip-devel

4
redhat/docker/osstw/Dockerfile.x86_64
Unescape View File

@ -28,3 +28,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
# Add GeoIP
RUN rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
# Add Jasper
RUN sudo rpm -e libjasper-devel libjasper6 \
&& sudo rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/distribution/leap/15.3/repo/oss/x86_64/{jasper,libjasper-devel,libjasper4}-2.0.14-3.19.1.x86_64.rpm

5
redhat/docker/osstw/packages
Unescape View File

@ -9,7 +9,6 @@ bison
bluez-devel
boost-devel
brp-check-suse
brp-extract-appdata
ccache
cdparanoia
cdparanoia-devel
@ -93,6 +92,7 @@ libical-devel
libidn-devel
libiw-devel
libjack-devel
libjasper6
libjasper-devel
liblcms2-devel
liblo-devel
@ -121,7 +121,6 @@ librsvg-devel
libsamplerate-devel
libSDL-devel
libsensors4-devel
libsmbclient-devel
libsndfile-devel
libtag-devel
libtheora-devel
@ -129,7 +128,6 @@ libtiff-devel
libtirpc-devel
libtool
libtwolame-devel
libudev-devel
libudisks2-0-devel
libv4l-devel
libvisual-devel
@ -197,6 +195,7 @@ swig
sword-devel
texlive-adjustbox
texlive-etoc
texlive-float
texlive-hanging
texlive-metafont-bin
texlive-multirow

4
redhat/extras/trinity-filesystem/trinity-filesystem.spec
Unescape View File

@ -62,6 +62,8 @@ This package installs the Trinity directory structure.
%defattr(-,root,root,-)
%dir %{tde_prefix}
%dir %{_datadir}/apps
%dir %{tde_bindir}
%dir %{tde_datadir}
@ -137,6 +139,8 @@ This package installs the Trinity directory structure.
%build
%install
%__install -d -m 755 %{?buildroot}%{_datadir}/apps
%__install -d -m 755 %{?buildroot}%{tde_prefix}
%__install -d -m 755 %{?buildroot}%{tde_bindir}

Write Preview
Loading…
Cancel
Save