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

RPM: update packages for Fedora 29

Browse Source
pull/14/head
François Andriot 6 years ago
parent 0fbd848285
commit 94bd1ae2e5
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File

6
redhat/Makefile.r14
Unescape View File

@ -797,7 +797,7 @@ endif
hk_classes: hk_classes:
# Not on Fedora 27, Opensuse TW # Not on Fedora 27, Opensuse TW
ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw)) ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
$(call buildpkg,extras/hk_classes) $(call buildpkg,extras/hk_classes)
endif endif
@ -821,7 +821,7 @@ kdissert:
klamav: klamav:
# Not on Fedora >= 27, Opensuse TW # Not on Fedora >= 27, Opensuse TW
ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw)) ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
$(call buildpkg,extras/klamav) $(call buildpkg,extras/klamav)
endif endif
@ -833,7 +833,7 @@ endif
knoda: hk_classes knoda: hk_classes
# Not on Fedora 27, Opensuse TW # Not on Fedora 27, Opensuse TW
ifeq (,$(filter $(DIST),.fc27 .fc28 .oss150 .osstw)) ifeq (,$(filter $(DIST),.fc27 .fc28 .fc29 .oss150 .osstw))
$(call buildpkg,extras/knoda) $(call buildpkg,extras/knoda)
endif endif

2
redhat/applications/k3b/k3b-14.0.0.spec
Unescape View File

@ -110,7 +110,7 @@ Requires(postun): coreutils
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500 || 0%{?fedora} >= 29
Requires: wodim Requires: wodim
REquires: genisoimage REquires: genisoimage
%else %else

2
redhat/applications/knetstats/knetstats-14.0.0.spec
Unescape View File

@ -145,7 +145,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/knetstats %{tde_bindir}/knetstats
%{tde_tdeappdir}/knetstats.desktop %{tde_tdeappdir}/knetstats.desktop
%{tde_datadir}/apps/knetstats %{tde_datadir}/apps/knetstats/
%{tde_tdedocdir}/HTML/en/knetstats/ %{tde_tdedocdir}/HTML/en/knetstats/
%{tde_datadir}/icons/hicolor/*/apps/knetstats.png %{tde_datadir}/icons/hicolor/*/apps/knetstats.png

10
redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
Unescape View File

@ -83,8 +83,12 @@ Provides: trinity-knetworkmanager = %{version}-%{release}
# NETWORKMANAGER support # NETWORKMANAGER support
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
BuildRequires: NetworkManager-devel
Requires: NetworkManager Requires: NetworkManager
%if 0%{?fedora} >= 29
BuildRequires: NetworkManager-libnm-devel
%else
BuildRequires: NetworkManager-devel
%endif
%else %else
Requires: NetworkManager-gnome Requires: NetworkManager-gnome
%endif %endif
@ -94,9 +98,13 @@ Requires: networkmanager
%endif %endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%if 0%{?pclinuxos} == 0 %if 0%{?pclinuxos} == 0
%if 0%{?fedora} >= 29
BuildRequires: NetworkManager-libnm-devel
%else
BuildRequires: NetworkManager-glib-devel BuildRequires: NetworkManager-glib-devel
%endif %endif
%endif %endif
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-devel
Requires: NetworkManager Requires: NetworkManager

9
redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
Unescape View File

@ -161,11 +161,12 @@ chmod -x example/*
-e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \ -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
-e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|" -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
# -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
%__sed -i "designer/designer.pro" \ %__sed -i "designer/designer.pro" \
-e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
-e "s|# DESTDIR|DESTDIR|" -e "s|# DESTDIR|DESTDIR|"
export QTDIR=%{_libdir}/tqt3 export QTDIR=%{_libdir}/tqt3
export TQTDIR=%{_prefix}
( cd qt; tqmake "DESTDIR=$PWD/../tmplib" ) ( cd qt; tqmake "DESTDIR=$PWD/../tmplib" )
( cd designer; tqmake ) ( cd designer; tqmake )
@ -179,6 +180,8 @@ export PATH="%{tde_bindir}:${PATH}"
%__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g" %__sed -i "qt/Makefile" -e "s|..\/..\/..\/..\/..|%{_prefix}|g"
%endif %endif
export QTDIR=%{_libdir}/tqt3
export TQTDIR=%{_prefix}
%__make %{?_smp_mflags} -C qt %__make %{?_smp_mflags} -C qt
%__make %{?_smp_mflags} -C designer %__make %{?_smp_mflags} -C designer
@ -186,6 +189,7 @@ export PATH="%{tde_bindir}:${PATH}"
%install %install
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export QTDIR=%{_libdir}/tqt3 export QTDIR=%{_libdir}/tqt3
export TQTDIR=%{_prefix}
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
# Installs the QT part # Installs the QT part
@ -202,7 +206,7 @@ for i in doc/html/*; do
done done
# Installs the Designer plugin # Installs the Designer plugin
for i in designer/*.so ${QTDIR}/plugins/designer/*.so; do for i in designer/*.so ${QTDIR}/plugins/designer/*.so ${TQTDIR}/plugins/designer/*.so; do
[ -r "${i}" ] || continue [ -r "${i}" ] || continue
%__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/} %__install -D -m 644 $i %{buildroot}${QTDIR}/plugins/designer/${i##*/}
done done
@ -212,6 +216,7 @@ done
%__mv -f tmplib/* %{buildroot}%{_libdir} %__mv -f tmplib/* %{buildroot}%{_libdir}
# Fix private headers location # Fix private headers location
%__mkdir_p %{buildroot}%{_includedir}
%__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3 %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
%__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla

2
redhat/docker/fedora32.sh
Unescape View File

@ -13,7 +13,7 @@ setarch i686 sudo dnf install \
--disablerepo="*" --enablerepo="fedora,updates" \ --disablerepo="*" --enablerepo="fedora,updates" \
--nodocs \ --nodocs \
--assumeyes \ --assumeyes \
@core bash vim @core bash vim yum-plugin-ovl
sudo sed -i "${INSTALLROOT}/etc/yum.repos.d/"*".repo" \ sudo sed -i "${INSTALLROOT}/etc/yum.repos.d/"*".repo" \
-e "s|\$basearch|i386|g" \ -e "s|\$basearch|i386|g" \

2
redhat/main/tdeedu/tdeedu-14.0.0.spec
Unescape View File

@ -95,7 +95,7 @@ BuildRequires: ocaml
# KIG python scripting support # KIG python scripting support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 %if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29
%define with_kig 0 %define with_kig 0
%else %else
%define with_kig 1 %define with_kig 1

Write Preview
Loading…
Cancel
Save